From 9f10b6be1ba36c9bed4d62859d929972dfb637fc Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Wed, 3 Mar 2021 19:41:45 +0100
Subject: [PATCH] Replace delete opt on GitHub bootstrap with curl

Signed-off-by: Hidde Beydals <hello@hidde.co>
---
 .github/workflows/bootstrap.yaml | 12 ++++++------
 cmd/flux/bootstrap_github.go     | 12 ------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/bootstrap.yaml b/.github/workflows/bootstrap.yaml
index 23942d47..f9bac650 100644
--- a/.github/workflows/bootstrap.yaml
+++ b/.github/workflows/bootstrap.yaml
@@ -68,12 +68,12 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITPROVIDER_BOT_TOKEN }}
       - name: delete repository
         run: |
-          /tmp/flux bootstrap github --manifests ./manifests/install/ \
-          --owner=fluxcd-testing \
-          --repository=flux-test-${{ steps.vars.outputs.sha_short }} \
-          --branch=main \
-          --path=test-cluster \
-          --delete
+          curl \
+            -X DELETE \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: token ${GITHUB_TOKEN}" \
+            --fail --silent \
+            https://api.github.com/repos/fluxcd-testing/flux-test-${{ steps.vars.outputs.sha_short }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITPROVIDER_BOT_TOKEN }}
       - name: Debug failure
diff --git a/cmd/flux/bootstrap_github.go b/cmd/flux/bootstrap_github.go
index 8fb48ac3..e40efd0f 100644
--- a/cmd/flux/bootstrap_github.go
+++ b/cmd/flux/bootstrap_github.go
@@ -80,7 +80,6 @@ type githubFlags struct {
 	hostname    string
 	path        flags.SafeRelativePath
 	teams       []string
-	delete      bool
 	sshHostname string
 }
 
@@ -101,9 +100,6 @@ func init() {
 	bootstrapGitHubCmd.Flags().StringVar(&githubArgs.sshHostname, "ssh-hostname", "", "GitHub SSH hostname, to be used when the SSH host differs from the HTTPS one")
 	bootstrapGitHubCmd.Flags().Var(&githubArgs.path, "path", "path relative to the repository root, when specified the cluster sync will be scoped to this path")
 
-	bootstrapGitHubCmd.Flags().BoolVar(&githubArgs.delete, "delete", false, "delete repository (used for testing only)")
-	bootstrapGitHubCmd.Flags().MarkHidden("delete")
-
 	bootstrapCmd.AddCommand(bootstrapGitHubCmd)
 }
 
@@ -163,14 +159,6 @@ func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error {
 	}
 	defer os.RemoveAll(tmpDir)
 
-	if githubArgs.delete {
-		if err := provider.DeleteRepository(ctx, repository); err != nil {
-			return err
-		}
-		logger.Successf("repository deleted")
-		return nil
-	}
-
 	// create GitHub repository if doesn't exists
 	logger.Actionf("connecting to %s", githubArgs.hostname)
 	changed, err := provider.CreateRepository(ctx, repository)