Merge pull request #27 from segmentio/yolken-misc-updates4

Misc. fixes

Author: yolken-segment

README.md

@@ -56,9 +56,9 @@ environments. We welcome feedback and collaboration to make `kubeapply` useful t
 
 `kubeapply` depends on the following tools:
 
-- [`kubectl`](https://kubernetes.io/docs/tasks/tools/install-kubectl/): v1.13 or newer
+- [`kubectl`](https://kubernetes.io/docs/tasks/tools/install-kubectl/): v1.16 or newer
 - [`helm`](https://helm.sh/docs/intro/install/): v3.5.0 or newer (only needed if using helm charts)
-- [`kubeval`](https://kubeval.instrumenta.dev/installation/): v1.13 or newer
+- [`kubeval`](https://kubeval.instrumenta.dev/installation/): v0.15.0 or newer
 
 Make sure that they're installed locally and available in your path.
 

cmd/kubeapply/subcmd/apply.go

@@ -175,7 +175,7 @@ func applyClusterPath(ctx context.Context, path string) error {
 			return err
 		}
 
-		results, rawDiffs, err := execDiff(ctx, clusterConfig, !applyFlagValues.simpleOutput)
+		results, rawDiffs, err := execDiff(ctx, clusterConfig, applyFlagValues.simpleOutput)
 		if err != nil {
 			log.Errorf("Error running diff: %+v", err)
 			log.Info(
@@ -185,7 +185,7 @@ func applyClusterPath(ctx context.Context, path string) error {
 		}
 
 		if results != nil {
-			diff.PrintSummary(results)
+			diff.PrintFull(results)
 		} else {
 			log.Infof("Raw diff results:\n%s", rawDiffs)
 		}

cmd/kubeapply/subcmd/diff_test.go

@@ -25,6 +25,4 @@ func TestDiff(t *testing.T) {
 		filepath.Join(testClusterDir, "cluster.yaml"),
 	)
 	require.Nil(t, err)
-
-	// TODO: Make this test more sophisticated.
 }

cmd/kubeapply/subcmd/expand.go

@@ -34,28 +34,28 @@ var expandCmd = &cobra.Command{
 }
 
 type expandFlags struct {
-	// Number of helm instances to run in parallel when expanding out charts.
-	helmParallelism int
-
 	// Clean old configs in expanded directory before expanding
 	clean bool
+
+	// Number of helm instances to run in parallel when expanding out charts.
+	helmParallelism int
 }
 
 var expandFlagsValues expandFlags
 
 func init() {
-	expandCmd.Flags().IntVar(
-		&expandFlagsValues.helmParallelism,
-		"parallelism",
-		5,
-		"Parallelism on helm expansions",
-	)
 	expandCmd.Flags().BoolVar(
 		&expandFlagsValues.clean,
 		"clean",
 		false,
 		"Clean out old configs in expanded directory",
 	)
+	expandCmd.Flags().IntVar(
+		&expandFlagsValues.helmParallelism,
+		"helm-parallelism",
+		5,
+		"Parallelism on helm expansions",
+	)
 
 	RootCmd.AddCommand(expandCmd)
 }
@@ -211,6 +211,7 @@ func expandProfile(
 		expandedPath,
 		clusterConfig,
 		true,
+		true,
 	)
 	if err != nil {
 		return err

data/data.go

@@ -18,7 +18,8 @@ import (
 )
 
 const (
-	diffScript = "kdiff-wrapper.sh"
+	structuredDiffScript = "kdiff-wrapper.sh"
+	rawDiffScript        = "raw-diff.sh"
 )
 
 // TODO: Switch to a YAML library that supports doing this splitting for us.
@@ -183,24 +184,29 @@ func (k *OrderedClient) Diff(
 	}
 
 	envVars := []string{}
+	var diffScript string
 
 	if structured {
-		diffCmd = filepath.Join(tempDir, diffScript)
-		err = ioutil.WriteFile(
-			diffCmd,
-			data.MustAsset(fmt.Sprintf("scripts/%s", diffScript)),
-			0755,
-		)
-		if err != nil {
-			return nil, err
-		}
+		diffScript = structuredDiffScript
+	} else {
+		diffScript = rawDiffScript
+	}
 
-		envVars = append(
-			envVars,
-			fmt.Sprintf("KUBECTL_EXTERNAL_DIFF=%s", diffCmd),
-		)
+	diffCmd = filepath.Join(tempDir, diffScript)
+	err = ioutil.WriteFile(
+		diffCmd,
+		data.MustAsset(fmt.Sprintf("scripts/%s", diffScript)),
+		0755,
+	)
+	if err != nil {
+		return nil, err
 	}
 
+	envVars = append(
+		envVars,
+		fmt.Sprintf("KUBECTL_EXTERNAL_DIFF=%s", diffCmd),
+	)
+
 	return runKubectlOutput(
 		ctx,
 		args,

pkg/cluster/kube/ordered_client.go

@@ -266,7 +266,10 @@ func (cc *KubeClusterClient) Config() *config.ClusterConfig {
 }
 
 // GetNamespaceUID returns the kubernetes identifier for a given namespace in this cluster.
-func (cc *KubeClusterClient) GetNamespaceUID(ctx context.Context, namespace string) (string, error) {
+func (cc *KubeClusterClient) GetNamespaceUID(
+	ctx context.Context,
+	namespace string,
+) (string, error) {
 	return cc.kubeClient.GetNamespaceUID(ctx, namespace)
 }
 

pkg/cluster/kube_client.go

@@ -422,7 +422,11 @@ func (whh *WebhookHandler) runApply(
 				clusterClient.Config().ServerSideApply,
 			)
 			if err != nil {
-				applyErr = fmt.Errorf("%+v", err)
+				applyErr = fmt.Errorf(
+					"Error applying for cluster %s: %+v",
+					clusterName,
+					err,
+				)
 				break
 			}
 
@@ -553,7 +557,11 @@ func (whh *WebhookHandler) runDiffs(
 			clusterClient.Config().ServerSideApply,
 		)
 		if err != nil {
-			diffErr = fmt.Errorf("%+v", err)
+			diffErr = fmt.Errorf(
+				"Error diffing for cluster %s: %+v",
+				clusterName,
+				err,
+			)
 			break
 		}
 

pkg/events/handler.go

@@ -338,7 +338,7 @@ func TestHandleWebhook(t *testing.T) {
 			expComments: []commentMatch{
 				{
 					contains: []string{
-						"Error comment: kubectl error",
+						"Error comment: Error diffing for cluster test-env:test-region:test-cluster2: kubectl error",
 					},
 				},
 			},
@@ -581,7 +581,7 @@ func TestHandleWebhook(t *testing.T) {
 			expComments: []commentMatch{
 				{
 					contains: []string{
-						"Error comment: kubectl error",
+						"Error comment: Error applying for cluster test-env:test-region:test-cluster2: kubectl error",
 					},
 				},
 			},

pkg/events/handler_test.go

@@ -52,6 +52,9 @@ func GetCoveredClusters(
 	err := filepath.Walk(
 		repoRoot,
 		func(path string, info os.FileInfo, err error) error {
+			if err != nil {
+				return err
+			}
 			if info.IsDir() {
 				return nil
 			}
@@ -212,6 +215,9 @@ func getExpandedConfigFiles(
 	err := filepath.Walk(
 		configObj.ExpandedPath,
 		func(path string, info os.FileInfo, err error) error {
+			if err != nil {
+				return err
+			}
 			if info.IsDir() {
 				return nil
 			}