feat: add new command cluster-supply-chain get (#149)

- gets the details of cluster supply chain selectors in the spec
- Update docs
- Bold the selector heading

Signed-off-by: Shash Reddy <snagarajared@vmware.com>

Author: shashwathi

.github/samples/clustersupplychain.yaml

@@ -0,0 +1,22 @@
+apiVersion: carto.run/v1alpha1
+kind: ClusterSupplyChain
+metadata:
+  name: ci-test
+spec:
+  params:
+  - default: main
+    name: gitops_branch
+  resources:
+  - name: source-provider
+    params:
+    - name: serviceAccount
+      value: default
+    templateRef:
+      kind: ClusterSourceTemplate
+      name: test
+  selector:
+    apps.tanzu.vmware.com/workload-type: web
+  selectorMatchExpressions:
+  - {key: name, operator: In, values: [payroll, web]}
+  selectorMatchFields:
+  - {key: spec.params, operator: Exists}

.github/workflows/ci.yaml

@@ -165,6 +165,12 @@ jobs:
         echo "##[group]Update workload"
           tanzu apps workload update petclinic --label cli.ci/new-label=true --yes
         echo "##[endgroup]"
+        echo "##[group]Apply clustersupplychain"
+          kubectl apply -f ./.github/samples/clustersupplychain.yaml
+        echo "##[endgroup]"
+         echo "##[group]Get cluster-supply-chain"
+          tanzu apps cluster-supply-chain get ci-test
+        echo "##[endgroup]"
     - name: Collect diagnostics
       run: |
         echo "##[group]Static Pod"

acceptance/vendor/cartographer/config/crd/bases/carto.run_clustersupplychains.yaml

@@ -140,6 +140,44 @@ spec:
                 additionalProperties:
                   type: string
                 type: object
+              selectorMatchExpressions:
+                items:
+                  properties:
+                    key:
+                      type: string
+                    operator:
+                      type: string
+                    values:
+                      items:
+                        type: string
+                      type: array
+                  required:
+                  - key
+                  - operator
+                  type: object
+                type: array
+              selectorMatchFields:
+                items:
+                  properties:
+                    key:
+                      minLength: 1
+                      type: string
+                    operator:
+                      enum:
+                      - In
+                      - NotIn
+                      - Exists
+                      - DoesNotExist
+                      type: string
+                    values:
+                      items:
+                        type: string
+                      type: array
+                  required:
+                  - key
+                  - operator
+                  type: object
+                type: array
               serviceAccountRef:
                 properties:
                   name:

docs/command-reference/tanzu_apps_cluster-supply-chain.md

@@ -20,5 +20,6 @@ patterns for building and configuring workloads
 ### SEE ALSO
 
 * [tanzu apps](tanzu_apps.md)	 - Applications on Kubernetes
+* [tanzu apps cluster-supply-chain get](tanzu_apps_cluster-supply-chain_get.md)	 - Get details from a cluster supply chain
 * [tanzu apps cluster-supply-chain list](tanzu_apps_cluster-supply-chain_list.md)	 - table listing of cluster supply chains
 

docs/command-reference/tanzu_apps_cluster-supply-chain_get.md

@@ -0,0 +1,37 @@
+## tanzu apps cluster-supply-chain get
+
+Get details from a cluster supply chain
+
+### Synopsis
+
+Get details from a cluster supply chain
+
+```
+tanzu apps cluster-supply-chain get <name> [flags]
+```
+
+### Examples
+
+```
+tanzu apps cluster-supply-chain get
+```
+
+### Options
+
+```
+  -h, --help   help for get
+```
+
+### Options inherited from parent commands
+
+```
+      --context name      name of the kubeconfig context to use (default is current-context defined by kubeconfig)
+      --kubeconfig file   kubeconfig file (default is $HOME/.kube/config)
+      --no-color          disable color output in terminals
+  -v, --verbose int32     number for the log level verbosity (default 1)
+```
+
+### SEE ALSO
+
+* [tanzu apps cluster-supply-chain](tanzu_apps_cluster-supply-chain.md)	 - patterns for building and configuring workloads
+

pkg/apis/cartographer/v1alpha1/cluster_supply_chain.go

@@ -44,10 +44,23 @@ type ClusterSupplyChain struct {
 }
 
 type SupplyChainSpec struct {
-	Resources         []SupplyChainResource `json:"resources"`
-	Selector          map[string]string     `json:"selector"`
-	Params            []DelegatableParam    `json:"params,omitempty"`
-	ServiceAccountRef ServiceAccountRef     `json:"serviceAccountRef,omitempty"`
+	Resources                []SupplyChainResource             `json:"resources"`
+	Params                   []DelegatableParam                `json:"params,omitempty"`
+	ServiceAccountRef        ServiceAccountRef                 `json:"serviceAccountRef,omitempty"`
+	Selector                 map[string]string                 `json:"selector,omitempty"`
+	SelectorMatchExpressions []metav1.LabelSelectorRequirement `json:"selectorMatchExpressions,omitempty"`
+	SelectorMatchFields      []FieldSelectorRequirement        `json:"selectorMatchFields,omitempty"`
+}
+
+type FieldSelectorOperator string
+
+type FieldSelectorRequirement struct {
+	// +kubebuilder:validation:MinLength=1
+	Key string `json:"key"`
+	// +kubebuilder:validation:Enum=In;NotIn;Exists;DoesNotExist
+	Operator FieldSelectorOperator `json:"operator"`
+	// the values array must be empty.
+	Values []string `json:"values,omitempty"`
 }
 
 type SupplyChainResource struct {

pkg/apis/cartographer/v1alpha1/zz_generated.deepcopy.go

@@ -35,6 +35,7 @@ func NewClusterSupplyChainCommand(ctx context.Context, c *cli.Config) *cobra.Com
 	}
 
 	cmd.AddCommand(NewClusterSupplyChainListCommand(ctx, c))
+	cmd.AddCommand(NewClusterSupplyChainGetCommand(ctx, c))
 
 	return cmd
 }

pkg/commands/clustersupplychain.go

@@ -0,0 +1,93 @@
+/*
+Copyright 2022 VMware, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package commands
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	"github.com/spf13/cobra"
+	apierrs "k8s.io/apimachinery/pkg/api/errors"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	cartov1alpha1 "github.com/vmware-tanzu/apps-cli-plugin/pkg/apis/cartographer/v1alpha1"
+	cli "github.com/vmware-tanzu/apps-cli-plugin/pkg/cli-runtime"
+	"github.com/vmware-tanzu/apps-cli-plugin/pkg/cli-runtime/validation"
+	"github.com/vmware-tanzu/apps-cli-plugin/pkg/completion"
+	"github.com/vmware-tanzu/apps-cli-plugin/pkg/printer"
+)
+
+type ClusterSupplyChainGetOptions struct {
+	Name string
+}
+
+var (
+	_ validation.Validatable = (*ClusterSupplyChainGetOptions)(nil)
+	_ cli.Executable         = (*ClusterSupplyChainGetOptions)(nil)
+)
+
+func (opts *ClusterSupplyChainGetOptions) Validate(ctx context.Context) validation.FieldErrors {
+	errs := validation.FieldErrors{}
+	if opts.Name == "" {
+		errs = errs.Also(validation.ErrMissingField(cli.NameArgumentName))
+	}
+	return errs
+}
+
+func (opts *ClusterSupplyChainGetOptions) Exec(ctx context.Context, c *cli.Config) error {
+	supplyChain := &cartov1alpha1.ClusterSupplyChain{}
+	err := c.Get(ctx, client.ObjectKey{Name: opts.Name}, supplyChain)
+	if err != nil {
+		if apierrs.IsNotFound(err) {
+			c.Errorf("Cluster Supply chain %q not found\n", opts.Name)
+			return cli.SilenceError(err)
+		}
+		return err
+	}
+	c.Printf(printer.ResourceStatus(supplyChain.Name, printer.FindCondition(supplyChain.Status.Conditions, cartov1alpha1.SupplyChainReady)))
+
+	c.Boldf("Supply Chain Selectors\n")
+	if len(supplyChain.Spec.Selector) == 0 && len(supplyChain.Spec.SelectorMatchExpressions) == 0 && len(supplyChain.Spec.SelectorMatchFields) == 0 {
+		c.Infof("No supply chain selectors found\n")
+	} else {
+		if err := printer.ClusterSupplyChainPrinter(c.Stdout, supplyChain); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+func NewClusterSupplyChainGetCommand(ctx context.Context, c *cli.Config) *cobra.Command {
+	opts := &ClusterSupplyChainGetOptions{}
+
+	cmd := &cobra.Command{
+		Use:   "get",
+		Short: "Get details from a cluster supply chain",
+		Long:  strings.TrimSpace(`Get details from a cluster supply chain`),
+		Example: strings.Join([]string{
+			fmt.Sprintf("%s cluster-supply-chain get", c.Name),
+		}, "\n"),
+		PreRunE:           cli.ValidateE(ctx, opts),
+		RunE:              cli.ExecE(ctx, c, opts),
+		ValidArgsFunction: completion.SuggestClusterSupplyChainNames(ctx, c),
+	}
+	cli.Args(cmd,
+		cli.NameArg(&opts.Name),
+	)
+
+	return cmd
+}