fix(contrib): exit when error on plugin build (#5984)

richardlt · web-flow · commit 1cfdf9d40e76 · 2021-10-22T12:20:09.000+02:00
diff --git a/contrib/integrations/arsenal/plugin-arsenal/Makefile b/contrib/integrations/arsenal/plugin-arsenal/Makefile
@@ -38,7 +38,7 @@ build: $(TARGET_DIR)
 			if test "$$GOOS" = "windows" ; then EXTENSION=".exe"; fi; \
 			echo Compiling $(TARGET_DIR)/$(TARGET_NAME)-$$GOOS-$$GOARCH$$EXTENSION $(VERSION); \
 			FILENAME=$(TARGET_NAME)-$$GOOS-$$GOARCH$$EXTENSION; \
-			GOOS=$$GOOS GOARCH=$$GOARCH CGO_ENABLED=0 $(GO_BUILD) $(TARGET_LDFLAGS) -o $(TARGET_DIR)/$$FILENAME; \
+			GOOS=$$GOOS GOARCH=$$GOARCH CGO_ENABLED=0 $(GO_BUILD) $(TARGET_LDFLAGS) -o $(TARGET_DIR)/$$FILENAME || exit 1; \
 			echo "$$PLUGIN_MANIFEST_BINARY" > $(TARGET_DIR)/plugin-arsenal-$$GOOS-$$GOARCH.yml; \
 			perl -pi -e s,%os%,$$GOOS,g $(TARGET_DIR)/plugin-arsenal-$$GOOS-$$GOARCH.yml; \
 			perl -pi -e s,%arch%,$$GOARCH,g $(TARGET_DIR)/plugin-arsenal-$$GOOS-$$GOARCH.yml; \
diff --git a/contrib/integrations/artifactory/plugin-artifactory-build-info/Makefile b/contrib/integrations/artifactory/plugin-artifactory-build-info/Makefile
@@ -38,7 +38,7 @@ build: $(TARGET_DIR)
 			if test "$$GOOS" = "windows" ; then EXTENSION=".exe"; fi; \
 			echo Compiling $(TARGET_DIR)/$(TARGET_NAME)-$$GOOS-$$GOARCH$$EXTENSION $(VERSION); \
 			FILENAME=$(TARGET_NAME)-$$GOOS-$$GOARCH$$EXTENSION; \
-			GOOS=$$GOOS GOARCH=$$GOARCH CGO_ENABLED=0 $(GO_BUILD) $(TARGET_LDFLAGS) -o $(TARGET_DIR)/$$FILENAME; \
+			GOOS=$$GOOS GOARCH=$$GOARCH CGO_ENABLED=0 $(GO_BUILD) $(TARGET_LDFLAGS) -o $(TARGET_DIR)/$$FILENAME || exit 1; \
 			echo "$$PLUGIN_MANIFEST_BINARY" > $(TARGET_DIR)/plugin-artifactory-build-info-$$GOOS-$$GOARCH.yml; \
 			perl -pi -e s,%os%,$$GOOS,g $(TARGET_DIR)/plugin-artifactory-build-info-$$GOOS-$$GOARCH.yml; \
 			perl -pi -e s,%arch%,$$GOARCH,g $(TARGET_DIR)/plugin-artifactory-build-info-$$GOOS-$$GOARCH.yml; \
diff --git a/contrib/integrations/artifactory/plugin-artifactory-download-artifact/Makefile b/contrib/integrations/artifactory/plugin-artifactory-download-artifact/Makefile
@@ -38,7 +38,7 @@ build: $(TARGET_DIR)
 			if test "$$GOOS" = "windows" ; then EXTENSION=".exe"; fi; \
 			echo Compiling $(TARGET_DIR)/$(TARGET_NAME)-$$GOOS-$$GOARCH$$EXTENSION $(VERSION); \
 			FILENAME=$(TARGET_NAME)-$$GOOS-$$GOARCH$$EXTENSION; \
-			GOOS=$$GOOS GOARCH=$$GOARCH CGO_ENABLED=0 $(GO_BUILD) $(TARGET_LDFLAGS) -o $(TARGET_DIR)/$$FILENAME; \
+			GOOS=$$GOOS GOARCH=$$GOARCH CGO_ENABLED=0 $(GO_BUILD) $(TARGET_LDFLAGS) -o $(TARGET_DIR)/$$FILENAME || exit 1; \
 			echo "$$PLUGIN_MANIFEST_BINARY" > $(TARGET_DIR)/plugin-artifactory-download-artifact-$$GOOS-$$GOARCH.yml; \
 			perl -pi -e s,%os%,$$GOOS,g $(TARGET_DIR)/plugin-artifactory-download-artifact-$$GOOS-$$GOARCH.yml; \
 			perl -pi -e s,%arch%,$$GOARCH,g $(TARGET_DIR)/plugin-artifactory-download-artifact-$$GOOS-$$GOARCH.yml; \
diff --git a/contrib/integrations/artifactory/plugin-artifactory-promote/Makefile b/contrib/integrations/artifactory/plugin-artifactory-promote/Makefile
@@ -38,7 +38,7 @@ build: $(TARGET_DIR)
 			if test "$$GOOS" = "windows" ; then EXTENSION=".exe"; fi; \
 			echo Compiling $(TARGET_DIR)/$(TARGET_NAME)-$$GOOS-$$GOARCH$$EXTENSION $(VERSION); \
 			FILENAME=$(TARGET_NAME)-$$GOOS-$$GOARCH$$EXTENSION; \
-			GOOS=$$GOOS GOARCH=$$GOARCH CGO_ENABLED=0 $(GO_BUILD) $(TARGET_LDFLAGS) -o $(TARGET_DIR)/$$FILENAME; \
+			GOOS=$$GOOS GOARCH=$$GOARCH CGO_ENABLED=0 $(GO_BUILD) $(TARGET_LDFLAGS) -o $(TARGET_DIR)/$$FILENAME || exit 1; \
 			echo "$$PLUGIN_MANIFEST_BINARY" > $(TARGET_DIR)/plugin-artifactory-promote-$$GOOS-$$GOARCH.yml; \
 			perl -pi -e s,%os%,$$GOOS,g $(TARGET_DIR)/plugin-artifactory-promote-$$GOOS-$$GOARCH.yml; \
 			perl -pi -e s,%arch%,$$GOARCH,g $(TARGET_DIR)/plugin-artifactory-promote-$$GOOS-$$GOARCH.yml; \
diff --git a/contrib/integrations/artifactory/plugin-artifactory-release/Makefile b/contrib/integrations/artifactory/plugin-artifactory-release/Makefile
@@ -38,7 +38,7 @@ build: $(TARGET_DIR)
 			if test "$$GOOS" = "windows" ; then EXTENSION=".exe"; fi; \
 			echo Compiling $(TARGET_DIR)/$(TARGET_NAME)-$$GOOS-$$GOARCH$$EXTENSION $(VERSION); \
 			FILENAME=$(TARGET_NAME)-$$GOOS-$$GOARCH$$EXTENSION; \
-			GOOS=$$GOOS GOARCH=$$GOARCH CGO_ENABLED=0 $(GO_BUILD) $(TARGET_LDFLAGS) -o $(TARGET_DIR)/$$FILENAME; \
+			GOOS=$$GOOS GOARCH=$$GOARCH CGO_ENABLED=0 $(GO_BUILD) $(TARGET_LDFLAGS) -o $(TARGET_DIR)/$$FILENAME || exit 1; \
 			echo "$$PLUGIN_MANIFEST_BINARY" > $(TARGET_DIR)/plugin-artifactory-release-$$GOOS-$$GOARCH.yml; \
 			perl -pi -e s,%os%,$$GOOS,g $(TARGET_DIR)/plugin-artifactory-release-$$GOOS-$$GOARCH.yml; \
 			perl -pi -e s,%arch%,$$GOARCH,g $(TARGET_DIR)/plugin-artifactory-release-$$GOOS-$$GOARCH.yml; \
diff --git a/contrib/integrations/artifactory/plugin-artifactory-upload-artifact/Makefile b/contrib/integrations/artifactory/plugin-artifactory-upload-artifact/Makefile
@@ -38,7 +38,7 @@ build: $(TARGET_DIR)
 			if test "$$GOOS" = "windows" ; then EXTENSION=".exe"; fi; \
 			echo Compiling $(TARGET_DIR)/$(TARGET_NAME)-$$GOOS-$$GOARCH$$EXTENSION $(VERSION); \
 			FILENAME=$(TARGET_NAME)-$$GOOS-$$GOARCH$$EXTENSION; \
-			GOOS=$$GOOS GOARCH=$$GOARCH CGO_ENABLED=0 $(GO_BUILD) $(TARGET_LDFLAGS) -o $(TARGET_DIR)/$$FILENAME; \
+			GOOS=$$GOOS GOARCH=$$GOARCH CGO_ENABLED=0 $(GO_BUILD) $(TARGET_LDFLAGS) -o $(TARGET_DIR)/$$FILENAME || exit 1; \
 			echo "$$PLUGIN_MANIFEST_BINARY" > $(TARGET_DIR)/plugin-artifactory-upload-artifact-$$GOOS-$$GOARCH.yml; \
 			perl -pi -e s,%os%,$$GOOS,g $(TARGET_DIR)/plugin-artifactory-upload-artifact-$$GOOS-$$GOARCH.yml; \
 			perl -pi -e s,%arch%,$$GOARCH,g $(TARGET_DIR)/plugin-artifactory-upload-artifact-$$GOOS-$$GOARCH.yml; \
diff --git a/contrib/integrations/hello/plugin-hello-deployment/Makefile b/contrib/integrations/hello/plugin-hello-deployment/Makefile
@@ -40,7 +40,7 @@ build: $(TARGET_DIR)
 			if test "$$GOOS" = "windows" ; then EXTENSION=".exe"; fi; \
 			FILENAME=deployment-plugin-$(TARGET_NAME)-$$GOOS-$$GOARCH$$EXTENSION; \
 			echo Compiling $(TARGET_DIR)/$$FILENAME $(VERSION); \
-			GOOS=$$GOOS GOARCH=$$GOARCH $(GO_BUILD) $(TARGET_LDFLAGS) -o $(TARGET_DIR)/$$FILENAME; \
+			GOOS=$$GOOS GOARCH=$$GOARCH $(GO_BUILD) $(TARGET_LDFLAGS) -o $(TARGET_DIR)/$$FILENAME || exit 1; \
 			echo "$$PLUGIN_MANIFEST_BINARY" > $(TARGET_DIR)/plugin-kubernetes-$$GOOS-$$GOARCH.yml; \
 			perl -pi -e s,%os%,$$GOOS,g $(TARGET_DIR)/plugin-kubernetes-$$GOOS-$$GOARCH.yml; \
 			perl -pi -e s,%arch%,$$GOARCH,g $(TARGET_DIR)/plugin-kubernetes-$$GOOS-$$GOARCH.yml; \
diff --git a/contrib/integrations/kubernetes/plugin-kubernetes/Makefile b/contrib/integrations/kubernetes/plugin-kubernetes/Makefile
@@ -44,7 +44,7 @@ build: $(TARGET_DIR)
 			if test "$$GOOS" = "windows" ; then EXTENSION=".exe"; fi; \
 			echo Compiling $(TARGET_DIR)/$(TARGET_NAME)-$$GOOS-$$GOARCH$$EXTENSION $(VERSION); \
 			FILENAME=$(TARGET_NAME)-$$GOOS-$$GOARCH$$EXTENSION; \
-			GOOS=$$GOOS GOARCH=$$GOARCH CGO_ENABLED=0 $(GO_BUILD) $(TARGET_LDFLAGS) -o $(TARGET_DIR)/$$FILENAME; \
+			GOOS=$$GOOS GOARCH=$$GOARCH CGO_ENABLED=0 $(GO_BUILD) $(TARGET_LDFLAGS) -o $(TARGET_DIR)/$$FILENAME || exit 1; \
 			echo "$$PLUGIN_MANIFEST_BINARY" > $(TARGET_DIR)/$(TARGET_NAME)-$$GOOS-$$GOARCH.yml; \
 			perl -pi -e s,%os%,$$GOOS,g $(TARGET_DIR)/$(TARGET_NAME)-$$GOOS-$$GOARCH.yml; \
 			perl -pi -e s,%arch%,$$GOARCH,g $(TARGET_DIR)/$(TARGET_NAME)-$$GOOS-$$GOARCH.yml; \
diff --git a/contrib/integrations/kubernetes/plugin-kubernetes/main.go b/contrib/integrations/kubernetes/plugin-kubernetes/main.go
@@ -244,10 +244,10 @@ func executeK8s(q *integrationplugin.RunQuery) error {
 	}
 
 	if namespace != "" && namespace != apiv1.NamespaceDefault {
-		if _, err := clientset.CoreV1().Namespaces().Get(namespace, metav1.GetOptions{}); err != nil {
+		if _, err := clientset.CoreV1().Namespaces().Get(context.Background(), namespace, metav1.GetOptions{}); err != nil {
 			ns := apiv1.Namespace{}
 			ns.SetName(namespace)
-			if _, errC := clientset.CoreV1().Namespaces().Create(&ns); errC != nil {
+			if _, errC := clientset.CoreV1().Namespaces().Create(context.Background(), &ns, metav1.CreateOptions{}); errC != nil {
 				return fmt.Errorf("Cannot create namespace %s in kubernetes: %v", namespace, errC)
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -244,10 +244,10 @@ func executeK8s(q *integrationplugin.RunQuery) error {`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`if namespace != "" && namespace != apiv1.NamespaceDefault {`
`247`		`- if _, err := clientset.CoreV1().Namespaces().Get(namespace, metav1.GetOptions{}); err != nil {`
	`247`	`+ if _, err := clientset.CoreV1().Namespaces().Get(context.Background(), namespace, metav1.GetOptions{}); err != nil {`
`248`	`248`	`ns := apiv1.Namespace{}`
`249`	`249`	`ns.SetName(namespace)`
`250`		`- if _, errC := clientset.CoreV1().Namespaces().Create(&ns); errC != nil {`
	`250`	`+ if _, errC := clientset.CoreV1().Namespaces().Create(context.Background(), &ns, metav1.CreateOptions{}); errC != nil {`
`251`	`251`	`return fmt.Errorf("Cannot create namespace %s in kubernetes: %v", namespace, errC)`
`252`	`252`	`}`
`253`	`253`	`}`