Merge master into release branch (#589)

* Name filtering and output format for the components command * Adding component output unit test * Adding case-insensitivity to component an configuration name filtering * Generate checksum files on release. (#586) * add renewed headers (#588) Co-authored-by: Phil Kedy <phil.kedy@gmail.com> Co-authored-by: Artur Souza <artursouza.ms@outlook.com> Co-authored-by: Yaron Schneider <yaronsc@microsoft.com>
dapr · Feb 11, 2021 · 509b3c9 · 509b3c9
1 parent b589bbf
commit 509b3c9
Show file tree

Hide file tree

Showing 66 changed files with 417 additions and 124 deletions.
diff --git a/.github/scripts/get_release_version.py b/.github/scripts/get_release_version.py
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------
-# Copyright (c) Microsoft Corporation.
+# Copyright (c) Microsoft Corporation and Dapr Contributors.
 # Licensed under the MIT License.
 # ------------------------------------------------------------
 

diff --git a/.github/workflows/dapr_cli.yaml b/.github/workflows/dapr_cli.yaml
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------
-# Copyright (c) Microsoft Corporation.
+# Copyright (c) Microsoft Corporation and Dapr Contributors.
 # Licensed under the MIT License.
 # ------------------------------------------------------------
 
@@ -102,6 +102,10 @@ jobs:
           REL_VER=`cat ${REL_VERSION_FILE}`
           echo "REL_VERSION=${REL_VER}" >> $GITHUB_ENV
           rm -f ${REL_VERSION_FILE}
+      - name: generate checksum files
+        run: cd ${ARTIFACT_DIR} && for i in *; do sha256sum -b $i > "$i.sha256"; done && cd -
+      - name: lists artifacts
+        run: ls -l ${{ env.ARTIFACT_DIR }}
       - name: publish binaries to github
         if: startswith(github.ref, 'refs/tags/v')
         run: |

diff --git a/.github/workflows/release_notification.yaml b/.github/workflows/release_notification.yaml
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------
-# Copyright (c) Microsoft Corporation.
+# Copyright (c) Microsoft Corporation and Dapr Contributors.
 # Licensed under the MIT License.
 # ------------------------------------------------------------
 

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) Microsoft Corporation.
+Copyright (c) Microsoft Corporation and Dapr Contributors.
 
 MIT License
 

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------
-# Copyright (c) Microsoft Corporation.
+# Copyright (c) Microsoft Corporation and Dapr Contributors.
 # Licensed under the MIT License.
 # ------------------------------------------------------------
 

diff --git a/cmd/completion.go b/cmd/completion.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/cmd/components.go b/cmd/components.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 
@@ -10,29 +10,24 @@ import (
 
 	"github.com/dapr/cli/pkg/kubernetes"
 	"github.com/dapr/cli/pkg/print"
-	"github.com/dapr/cli/utils"
-	"github.com/gocarina/gocsv"
 	"github.com/spf13/cobra"
 )
 
+var (
+	componentsName         string
+	componentsOutputFormat string
+)
+
 var ComponentsCmd = &cobra.Command{
 	Use:   "components",
 	Short: "List all Dapr components. Supported platforms: Kubernetes",
 	Run: func(cmd *cobra.Command, args []string) {
 		if kubernetesMode {
-			components, err := kubernetes.Components()
-			if err != nil {
-				print.FailureStatusEvent(os.Stdout, err.Error())
-				os.Exit(1)
-			}
-
-			table, err := gocsv.MarshalString(components)
+			err := kubernetes.PrintComponents(componentsName, componentsOutputFormat)
 			if err != nil {
 				print.FailureStatusEvent(os.Stdout, err.Error())
 				os.Exit(1)
 			}
-
-			utils.PrintTable(table)
 		}
 	},
 	Example: `
@@ -42,6 +37,8 @@ dapr components -k
 }
 
 func init() {
+	ComponentsCmd.Flags().StringVarP(&componentsName, "name", "n", "", "The components name to be printed (optional)")
+	ComponentsCmd.Flags().StringVarP(&componentsOutputFormat, "output", "o", "list", "Output format (options: json or yaml or list)")
 	ComponentsCmd.Flags().BoolVarP(&kubernetesMode, "kubernetes", "k", false, "List all Dapr components in a Kubernetes cluster")
 	ComponentsCmd.Flags().BoolP("help", "h", false, "Print this help message")
 	ComponentsCmd.MarkFlagRequired("kubernetes")

diff --git a/cmd/configurations.go b/cmd/configurations.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/cmd/dapr.go b/cmd/dapr.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/cmd/dashboard.go b/cmd/dashboard.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/cmd/init.go b/cmd/init.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/cmd/invoke.go b/cmd/invoke.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/cmd/list.go b/cmd/list.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/cmd/logs.go b/cmd/logs.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/cmd/mtls.go b/cmd/mtls.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/cmd/publish.go b/cmd/publish.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/cmd/run.go b/cmd/run.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/cmd/status.go b/cmd/status.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/cmd/stop.go b/cmd/stop.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/cmd/uninstall.go b/cmd/uninstall.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/cmd/upgrade.go b/cmd/upgrade.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/go.mod b/go.mod
@@ -26,7 +26,6 @@ require (
 	gopkg.in/yaml.v2 v2.3.0
 	helm.sh/helm/v3 v3.4.0
 	k8s.io/api v0.20.0
-	k8s.io/apiextensions-apiserver v0.20.0
 	k8s.io/apimachinery v0.20.0
 	k8s.io/cli-runtime v0.20.0
 	k8s.io/client-go v0.20.0

diff --git a/install/install.ps1 b/install/install.ps1
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------
-# Copyright (c) Microsoft Corporation.
+# Copyright (c) Microsoft Corporation and Dapr Contributors.
 # Licensed under the MIT License.
 # ------------------------------------------------------------
 param (

diff --git a/install/install.sh b/install/install.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # ------------------------------------------------------------
-# Copyright (c) Microsoft Corporation.
+# Copyright (c) Microsoft Corporation and Dapr Contributors.
 # Licensed under the MIT License.
 # ------------------------------------------------------------
 

diff --git a/main.go b/main.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/pkg/age/age.go b/pkg/age/age.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/pkg/api/api.go b/pkg/api/api.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/pkg/kubernetes/client.go b/pkg/kubernetes/client.go
@@ -1,5 +1,5 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 

diff --git a/pkg/kubernetes/components.go b/pkg/kubernetes/components.go
@@ -1,15 +1,20 @@
 // ------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation and Dapr Contributors.
 // Licensed under the MIT License.
 // ------------------------------------------------------------
 
 package kubernetes
 
 import (
+	"io"
+	"os"
 	"strings"
 
-	"github.com/dapr/cli/pkg/age"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/dapr/cli/pkg/age"
+	"github.com/dapr/cli/utils"
+	v1alpha1 "github.com/dapr/dapr/pkg/apis/components/v1alpha1"
 )
 
 // ComponentsOutput represent a Dapr component.
@@ -22,20 +27,51 @@ type ComponentsOutput struct {
 	Age     string `csv:"AGE"`
 }
 
-// List outputs all Dapr components.
-func Components() ([]ComponentsOutput, error) {
-	client, err := DaprClient()
+// PrintComponents prints all Dapr components.
+func PrintComponents(name, outputFormat string) error {
+	return writeComponents(os.Stdout, func() (*v1alpha1.ComponentList, error) {
+		client, err := DaprClient()
+		if err != nil {
+			return nil, err
+		}
+
+		return client.ComponentsV1alpha1().Components(meta_v1.NamespaceAll).List(meta_v1.ListOptions{})
+	}, name, outputFormat)
+}
+
+func writeComponents(writer io.Writer, getConfigFunc func() (*v1alpha1.ComponentList, error), name, outputFormat string) error {
+	confs, err := getConfigFunc()
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	comps, err := client.ComponentsV1alpha1().Components(meta_v1.NamespaceAll).List(meta_v1.ListOptions{})
-	if err != nil {
-		return nil, err
+	filtered := []v1alpha1.Component{}
+	filteredSpecs := []configurationDetailedOutput{}
+	for _, c := range confs.Items {
+		confName := c.GetName()
+		if confName == "daprsystem" {
+			continue
+		}
+
+		if name == "" || strings.EqualFold(confName, name) {
+			filtered = append(filtered, c)
+			filteredSpecs = append(filteredSpecs, configurationDetailedOutput{
+				Name: confName,
+				Spec: c.Spec,
+			})
+		}
+	}
+
+	if outputFormat == "" || outputFormat == "list" {
+		return printComponentList(writer, filtered)
 	}
 
+	return utils.PrintDetail(writer, outputFormat, filteredSpecs)
+}
+
+func printComponentList(writer io.Writer, list []v1alpha1.Component) error {
 	co := []ComponentsOutput{}
-	for _, c := range comps.Items {
+	for _, c := range list {
 		co = append(co, ComponentsOutput{
 			Name:    c.GetName(),
 			Type:    c.Spec.Type,
@@ -45,5 +81,6 @@ func Components() ([]ComponentsOutput, error) {
 			Scopes:  strings.Join(c.Scopes, ","),
 		})
 	}
-	return co, nil
+
+	return utils.MarshalAndWriteTable(writer, co)
 }