feat: add provider attribute

chart/infra-server/static/flavors.yaml

@@ -5,6 +5,7 @@
  name: StackRox Demo
  description: Demo running StackRox {{ .Chart.Annotations.acsDemoVersion }}
  availability: default
+ provider: gcp
  workflow: configuration/workflow-demo.yaml
  parameters:
  - name: name
@@ -63,6 +64,7 @@
  name: StackRox Demo for QA testing
  description: Demo running a provided StackRox version
  availability: stable
+ provider: gcp
  workflow: configuration/workflow-qa-demo.yaml
  parameters:
  - name: name
@@ -142,6 +144,7 @@
  name: GKE Default
  description: GKE cluster running the default version
  availability: stable
+ provider: gcp
  workflow: configuration/workflow-gke-default.yaml
  aliases:
  - gke
@@ -205,6 +208,7 @@
  name: OpenShift 3.11
  description: OpenShift 3.11 cluster
  availability: stable
+ provider: gcp
  workflow: configuration/workflow-openshift-multi.yaml
  aliases:
  - openshift-3
@@ -276,6 +280,7 @@
  name: OpenShift 4.x
  description: OpenShift 4.x OCP or OKD cluster
  availability: stable
+ provider: gcp
  workflow: configuration/workflow-openshift-4.yaml
  aliases:
  - ocp-4
@@ -398,6 +403,7 @@
  name: OpenShift 4.x Demo
  description: OpenShift 4.x Demo
  availability: stable
+ provider: gcp
  workflow: configuration/workflow-openshift-4-demo.yaml
  aliases:
  - ocp-4-demo
@@ -546,6 +552,7 @@
  name: OpenShift 4.x Perf&Scale
  description: OpenShift 4.x Perf&Scale
  availability: stable
+ provider: gcp
  workflow: configuration/workflow-openshift-4-perf-scale.yaml
  aliases:
  - ocp-4-perf-scale
@@ -668,6 +675,7 @@
  name: EKS
  description: AWS EKS cluster
  availability: stable
+ provider: aws
  workflow: configuration/workflow-eks.yaml
  parameters:
  - name: name
@@ -705,6 +713,7 @@
  name: AKS
  description: Azure AKS cluster
  availability: stable
+ provider: azure
  workflow: configuration/workflow-aks.yaml
  parameters:
  - name: name
@@ -757,6 +766,7 @@
  name: ARO
  description: Openshift ARO cluster
  availability: stable
+ provider: azure
  workflow: configuration/workflow-openshift-aro.yaml
  parameters:
  - name: name
@@ -800,6 +810,7 @@
  name: ROSA
  description: Openshift ROSA cluster
  availability: stable
+ provider: aws
  workflow: configuration/workflow-openshift-rosa.yaml
  parameters:
  - name: name
@@ -848,6 +859,7 @@
  name: Hypershift on ROSA (HCP)
  description: Openshift ROSA HCP (Hypershift ManagedCP) cluster
  availability: stable
+ provider: aws
  workflow: configuration/workflow-openshift-rosa-hcp.yaml
  parameters:
  - name: name
@@ -923,6 +935,7 @@
  name: OSD on AWS
  description: Openshift dedicated on AWS
  availability: stable
+ provider: aws
  workflow: configuration/workflow-osd-aws.yaml
  parameters:
  - name: name
@@ -977,6 +990,7 @@
  name: OSD on GCP
  description: Openshift dedicated on GCP
  availability: stable
+ provider: gcp
  workflow: configuration/workflow-osd-gcp.yaml
  parameters:
  - name: name
@@ -1031,6 +1045,7 @@
  name: IBM ROKS
  description: IBM ROKS cluster on VPC infrastructure.
  availability: stable
+ provider: ibm
  workflow: configuration/workflow-openshift-ibmroks.yaml
  parameters:
  - name: name
@@ -1133,6 +1148,7 @@
  name: Test URL Artifact
  description: Test URL Artifact
  availability: stable
+ provider: ""
  workflow: configuration/test-url-artifact.yaml
  parameters:
  - name: name
@@ -1150,6 +1166,7 @@
  name: Test Connect Artifact
  description: Test Connect Artifact
  availability: stable
+ provider: ""
  aliases:
  - test-alias-1
  - test-alias-2

cmd/infractl/flavor/list/fancy.go

@@ -20,6 +20,7 @@ func (p prettyFlavorListResponse) PrettyPrint(cmd *cobra.Command) {
  cmd.Printf(" Name: %s\n", flavor.GetName())
  cmd.Printf(" Description: %s\n", flavor.GetDescription())
  cmd.Printf(" Availability: %s\n", flavor.GetAvailability())
+ cmd.Printf(" Provider: %s\n", flavor.GetProvider())
  }
 }
 

config/config.go

@@ -96,6 +96,9 @@ type FlavorConfig struct {
  // Description is a human readable description for the flavor.
  Description string `json:"description"`
 
+ // (Cloud) Provider
+ Provider string `json:"provider"`
+
  // Availability is an availability classification level. One of "alpha",
  // "beta", "stable", or "default". Exactly 1 default flavor must be
  // configured.

flavor/registry.go

@@ -206,6 +206,7 @@ func NewFromConfig(filename string) (*Registry, error) {
  ID: flavorCfg.ID,
  Name: flavorCfg.Name,
  Description: flavorCfg.Description,
+ Provider: flavorCfg.Provider,
  Availability: v1.FlavorAvailability(availability),
  Parameters: parameters,
  Artifacts: artifacts,

flavor/workflow_templates.bats

@@ -53,6 +53,13 @@ setup_file() {
  assert_output --partial '"msg":"ignoring a workflow template with an unknown infra.stackrox.io/availability annotation","template-name":"invalid-availability","template-availability":"woot!"'
 }
 
+@test "provider is set" {
+ flavor="$(infractl flavor get test-gke-lite --json)"
+ assert_success
+ provider="$(echo "$flavor" | jq -r '.Provider')"
+ assert_equal "$provider" "gcp"
+}
+
 # Parameters
 
 @test "parameters must have descriptions" {

flavor/workflow_templates.go

@@ -123,6 +123,7 @@ func workflowTemplate2Flavor(template *v1alpha1.WorkflowTemplate) *v1.Flavor {
  Name: template.ObjectMeta.Name,
  Description: template.ObjectMeta.Annotations["infra.stackrox.io/description"],
  Availability: availability,
+ Provider: template.ObjectMeta.Annotations["infra.stackrox.io/provider"],
  Parameters: getParametersFromWorkflowTemplate(template),
  Artifacts: make(map[string]*v1.FlavorArtifact),
  }