cmd/gitops-pusher: be less paranoid about external modifications (tailscale#5488)

Xe Iaso · web-flow · commit 122bd667dcfd · 2022-08-30T09:41:25.000-04:00
This makes a "modified externally" error turn into a "modified externally" warning. It means CI won't fail if someone does something manually in the admin console.

Signed-off-by: Xe &lt;xe@tailscale.com&gt;
diff --git a/cmd/gitops-pusher/gitops-pusher.go b/cmd/gitops-pusher/gitops-pusher.go
@@ -30,17 +30,14 @@ var (
 	cacheFname   = rootFlagSet.String("cache-file", "./version-cache.json", "filename for the previous known version hash")
 	timeout      = rootFlagSet.Duration("timeout", 5*time.Minute, "timeout for the entire CI run")
 	githubSyntax = rootFlagSet.Bool("github-syntax", true, "use GitHub Action error syntax (https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#setting-an-error-message)")
-
-	modifiedExternallyFailure = make(chan struct{}, 1)
 )
 
 func modifiedExternallyError() {
 	if *githubSyntax {
-		fmt.Printf("::error file=%s,line=1,col=1,title=Policy File Modified Externally::The policy file was modified externally in the admin console.\n", *policyFname)
+		fmt.Printf("::warning file=%s,line=1,col=1,title=Policy File Modified Externally::The policy file was modified externally in the admin console.\n", *policyFname)
 	} else {
 		fmt.Printf("The policy file was modified externally in the admin console.\n")
 	}
-	modifiedExternallyFailure <- struct{}{}
 }
 
 func apply(cache *Cache, tailnet, apiKey string) func(context.Context, []string) error {
@@ -207,10 +204,6 @@ func main() {
 		fmt.Println(err)
 		os.Exit(1)
 	}
-
-	if len(modifiedExternallyFailure) != 0 {
-		os.Exit(1)
-	}
 }
 
 func sumFile(fname string) (string, error) {

Original file line number	Diff line number	Diff line change
`@@ -30,17 +30,14 @@ var (`
`30`	`30`	`cacheFname = rootFlagSet.String("cache-file", "./version-cache.json", "filename for the previous known version hash")`
`31`	`31`	`timeout = rootFlagSet.Duration("timeout", 5*time.Minute, "timeout for the entire CI run")`
`32`	`32`	`githubSyntax = rootFlagSet.Bool("github-syntax", true, "use GitHub Action error syntax (https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#setting-an-error-message)")`
`33`		`-`
`34`		`- modifiedExternallyFailure = make(chan struct{}, 1)`
`35`	`33`	`)`
`36`	`34`
`37`	`35`	`func modifiedExternallyError() {`
`38`	`36`	`if *githubSyntax {`
`39`		`- fmt.Printf("::error file=%s,line=1,col=1,title=Policy File Modified Externally::The policy file was modified externally in the admin console.\n", *policyFname)`
	`37`	`+ fmt.Printf("::warning file=%s,line=1,col=1,title=Policy File Modified Externally::The policy file was modified externally in the admin console.\n", *policyFname)`
`40`	`38`	`} else {`
`41`	`39`	`fmt.Printf("The policy file was modified externally in the admin console.\n")`
`42`	`40`	`}`
`43`		`- modifiedExternallyFailure <- struct{}{}`
`44`	`41`	`}`
`45`	`42`
`46`	`43`	`func apply(cache *Cache, tailnet, apiKey string) func(context.Context, []string) error {`
`@@ -207,10 +204,6 @@ func main() {`
`207`	`204`	`fmt.Println(err)`
`208`	`205`	`os.Exit(1)`
`209`	`206`	`}`
`210`		`-`
`211`		`- if len(modifiedExternallyFailure) != 0 {`
`212`		`- os.Exit(1)`
`213`		`- }`
`214`	`207`	`}`
`215`	`208`
`216`	`209`	`func sumFile(fname string) (string, error) {`