From 6837b7dd1d586856be645b79da22b5d4efc74d5f Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Thu, 22 Feb 2024 19:29:45 -0700 Subject: [PATCH 1/4] start adding provider --- chart/infra-server/static/flavors.yaml | 17 +++++++++++++++++ cmd/infractl/flavor/list/fancy.go | 1 + config/config.go | 3 +++ flavor/registry.go | 1 + flavor/workflow_templates.bats | 7 +++++++ flavor/workflow_templates.go | 1 + 6 files changed, 30 insertions(+) diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index 5b4c865f2..17f12d5ed 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/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 diff --git a/cmd/infractl/flavor/list/fancy.go b/cmd/infractl/flavor/list/fancy.go index 9d64d6429..4fc786448 100644 --- a/cmd/infractl/flavor/list/fancy.go +++ b/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()) } } diff --git a/config/config.go b/config/config.go index 29701c50e..7cae96ccb 100644 --- a/config/config.go +++ b/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. diff --git a/flavor/registry.go b/flavor/registry.go index ec75716a9..64cade518 100644 --- a/flavor/registry.go +++ b/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, diff --git a/flavor/workflow_templates.bats b/flavor/workflow_templates.bats index 5ecfd3969..a7f07d906 100755 --- a/flavor/workflow_templates.bats +++ b/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 + availability="$(echo "$flavor" | jq -r '.Provider')" + assert_equal "$provider" "gcp" +} + # Parameters @test "parameters must have descriptions" { diff --git a/flavor/workflow_templates.go b/flavor/workflow_templates.go index 776be36b8..0292820f1 100644 --- a/flavor/workflow_templates.go +++ b/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.Provider, Parameters: getParametersFromWorkflowTemplate(template), Artifacts: make(map[string]*v1.FlavorArtifact), } From fca16738ff410a948d751556a0bf0473c878716b Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Thu, 22 Feb 2024 19:39:09 -0700 Subject: [PATCH 2/4] add GetProvider --- generated/api/v1/service.pb.go | 252 +++++++++++++------------- generated/api/v1/service.swagger.json | 4 + proto/api/v1/service.proto | 3 + 3 files changed, 138 insertions(+), 121 deletions(-) diff --git a/generated/api/v1/service.pb.go b/generated/api/v1/service.pb.go index 482da10b5..a92c917e1 100644 --- a/generated/api/v1/service.pb.go +++ b/generated/api/v1/service.pb.go @@ -732,7 +732,9 @@ type Flavor struct { // Artifacts is a map of artifacts produced by this flavor. Artifacts map[string]*FlavorArtifact `protobuf:"bytes,6,rep,name=Artifacts,proto3" json:"Artifacts,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Aliases are alternative IDs of the flavor. - Aliases []string `protobuf:"bytes,7,rep,name=Aliases,proto3" json:"Aliases,omitempty"` + Aliases []string `protobuf:"bytes,7,rep,name=Aliases,proto3" json:"Aliases,omitempty"` + // (cloud) Provider is a human readable name of the provider. + Provider string `protobuf:"bytes,8,opt,name=Provider,proto3" json:"Provider,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -812,6 +814,13 @@ func (m *Flavor) GetAliases() []string { return nil } +func (m *Flavor) GetProvider() string { + if m != nil { + return m.Provider + } + return "" +} + // FlavorListRequest represents a request to FlavorService.List. type FlavorListRequest struct { // all indicates that all flavors should be returned, by default @@ -1666,126 +1675,127 @@ func init() { func init() { proto.RegisterFile("service.proto", fileDescriptor_a0b84a42fa06f626) } var fileDescriptor_a0b84a42fa06f626 = []byte{ - // 1901 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0xcb, 0x73, 0x1b, 0x49, - 0x19, 0xf7, 0x48, 0xb2, 0x1e, 0x9f, 0x6c, 0x65, 0xdc, 0x71, 0x9c, 0xd9, 0x89, 0xd7, 0xa4, 0x7a, - 0x97, 0x22, 0x65, 0xb2, 0xd6, 0x46, 0x40, 0xed, 0x56, 0xc8, 0x2e, 0x25, 0x4b, 0x72, 0x2c, 0x90, - 0x1f, 0xb4, 0xec, 0xcd, 0x2e, 0x1c, 0xa0, 0x2d, 0xb5, 0xe4, 0x29, 0x8f, 0x66, 0xc4, 0x4c, 0x4b, - 0x59, 0x57, 0x2a, 0x1c, 0xf8, 0x17, 0x38, 0x50, 0xfc, 0x1f, 0x9c, 0x28, 0x2e, 0x1c, 0x39, 0x52, - 0x14, 0xff, 0x01, 0x57, 0x6e, 0x1c, 0x38, 0x52, 0xfd, 0x98, 0x87, 0x5e, 0x49, 0x2a, 0xdc, 0xe6, - 0x7b, 0xf4, 0xef, 0xfb, 0xfa, 0x7b, 0xf6, 0xc0, 0x66, 0xc8, 0x82, 0xa9, 0xd3, 0x63, 0x07, 0xe3, - 0xc0, 0xe7, 0x3e, 0xca, 0x4c, 0x9f, 0xd8, 0xbb, 0x43, 0xdf, 0x1f, 0xba, 0xac, 0x4a, 0xc7, 0x4e, - 0x95, 0x7a, 0x9e, 0xcf, 0x29, 0x77, 0x7c, 0x2f, 0x54, 0x1a, 0xf6, 0x9e, 0x96, 0x4a, 0xea, 0x6a, - 0x32, 0xa8, 0xf6, 0x27, 0x81, 0x54, 0xd0, 0xf2, 0x07, 0xf3, 0x72, 0x36, 0x1a, 0xf3, 0x5b, 0x2d, - 0xfc, 0xce, 0xbc, 0x90, 0x3b, 0x23, 0x16, 0x72, 0x3a, 0x1a, 0x2b, 0x05, 0xbc, 0x07, 0x1b, 0x84, - 0x85, 0xfe, 0x24, 0xe8, 0xb1, 0xc3, 0xdb, 0x76, 0x13, 0x55, 0x20, 0xe3, 0xf4, 0x2d, 0xe3, 0xa1, - 0xf1, 0xa8, 0x44, 0x32, 0x4e, 0x1f, 0xff, 0xdd, 0x80, 0xc2, 0x57, 0x2c, 0x08, 0x1d, 0xdf, 0x43, - 0x9f, 0x43, 0xe9, 0x70, 0xe2, 0xb8, 0xfd, 0x26, 0xe5, 0x4c, 0xaa, 0x94, 0x6b, 0xf6, 0x81, 0x32, - 0x70, 0x10, 0x19, 0x38, 0xb8, 0x88, 0x0c, 0x90, 0x44, 0x19, 0xed, 0x42, 0xe9, 0xb9, 0xc3, 0x1b, - 0xfe, 0x68, 0xe4, 0x70, 0x2b, 0x23, 0xc1, 0x13, 0x86, 0x94, 0xfa, 0xda, 0x88, 0x95, 0xd5, 0xd2, - 0x88, 0x81, 0x6c, 0x28, 0x9e, 0xbb, 0x94, 0x0f, 0xfc, 0x60, 0x64, 0xe5, 0xa4, 0x30, 0xa6, 0x91, - 0x15, 0x3b, 0x67, 0xad, 0x4b, 0x51, 0x21, 0x75, 0xea, 0x85, 0x1f, 0xdc, 0x0c, 0x5c, 0xff, 0xa5, - 0x95, 0x57, 0xa7, 0x22, 0x1a, 0xbf, 0x82, 0xca, 0x8b, 0x6b, 0x9f, 0x8e, 0x1c, 0xc2, 0xc2, 0xb1, - 0xef, 0x85, 0x0c, 0xed, 0x41, 0xee, 0x32, 0x64, 0x81, 0xbe, 0x54, 0xf1, 0x60, 0xfa, 0xe4, 0x40, - 0xd0, 0xc7, 0x6b, 0x44, 0xf2, 0xd1, 0x33, 0xa8, 0x74, 0x55, 0xda, 0xea, 0xbd, 0x9e, 0x3f, 0xf1, - 0xd4, 0x25, 0xca, 0x35, 0x24, 0x34, 0x67, 0x25, 0xc7, 0x6b, 0x64, 0x4e, 0xf7, 0xb0, 0x0c, 0xa5, - 0x71, 0xe0, 0x78, 0x3d, 0x67, 0x4c, 0x5d, 0xfc, 0x5b, 0x65, 0x0a, 0xd5, 0x20, 0xdf, 0xfa, 0x76, - 0xec, 0x04, 0xb7, 0xef, 0x10, 0x49, 0xad, 0x89, 0x10, 0xe4, 0x4e, 0xe9, 0x88, 0xe9, 0x08, 0xca, - 0x6f, 0xb4, 0x0d, 0xeb, 0xad, 0x11, 0x75, 0x5c, 0x1d, 0x38, 0x45, 0x88, 0xc0, 0x9c, 0x3b, 0x3d, - 0x3e, 0x09, 0x98, 0x8e, 0x59, 0x44, 0xe2, 0x3f, 0x19, 0xf3, 0x77, 0x89, 0x61, 0x8d, 0x14, 0xec, - 0x43, 0x28, 0x37, 0x59, 0xd8, 0x0b, 0x9c, 0xb1, 0x28, 0x35, 0x6d, 0x31, 0xcd, 0x5a, 0x61, 0xd8, - 0x86, 0x62, 0x3b, 0x0c, 0x27, 0xac, 0x5f, 0xe7, 0xd2, 0x72, 0x96, 0xc4, 0xb4, 0xc8, 0xf3, 0xa9, - 0xcf, 0x0f, 0xd9, 0xc0, 0x0f, 0x98, 0xcc, 0x57, 0x96, 0x24, 0x0c, 0x21, 0x95, 0xd7, 0x64, 0x61, - 0x9d, 0xcb, 0x94, 0x65, 0x49, 0xc2, 0xc0, 0x5d, 0xd8, 0xbc, 0xf0, 0x6f, 0x98, 0x17, 0xa7, 0xec, - 0x31, 0x14, 0xa2, 0x5c, 0x18, 0xab, 0x72, 0x41, 0x22, 0x15, 0xe1, 0xac, 0x3c, 0xae, 0x2f, 0xa2, - 0x08, 0xfc, 0x4f, 0x03, 0x4a, 0xe7, 0x34, 0xa0, 0x23, 0xc6, 0x59, 0xf0, 0xfe, 0x61, 0xf8, 0x8a, - 0xba, 0x13, 0x16, 0x85, 0x41, 0x12, 0x22, 0x0c, 0x67, 0x52, 0x4e, 0x5d, 0x19, 0x86, 0x22, 0x89, - 0x69, 0x19, 0x22, 0x8f, 0xb3, 0x40, 0xc8, 0xd6, 0x95, 0x2c, 0xa2, 0x05, 0xda, 0x59, 0xd0, 0x67, - 0x81, 0x0c, 0xc0, 0x3a, 0x51, 0x84, 0xf0, 0xec, 0x98, 0xb9, 0x63, 0xab, 0xa0, 0x3c, 0x13, 0xdf, - 0x02, 0xe5, 0x28, 0xf0, 0x47, 0x47, 0x8e, 0xcb, 0xac, 0xa2, 0x42, 0x89, 0x68, 0xfc, 0x37, 0x03, - 0x2a, 0x47, 0x2e, 0x9d, 0xfa, 0x41, 0x3d, 0xe0, 0xce, 0x80, 0xf6, 0xde, 0x37, 0xc7, 0x9f, 0x42, - 0xee, 0x82, 0x0e, 0x43, 0x2b, 0xfb, 0x30, 0xfb, 0xa8, 0x5c, 0xdb, 0x15, 0x11, 0x9e, 0xc5, 0x3d, - 0x10, 0xe2, 0x96, 0xc7, 0x83, 0x5b, 0x22, 0x35, 0xed, 0x33, 0x28, 0xc5, 0x2c, 0x64, 0x42, 0xf6, - 0x86, 0xdd, 0x6a, 0x9b, 0xe2, 0x13, 0x3d, 0x86, 0xf5, 0xa9, 0x8c, 0x96, 0xea, 0x9f, 0x9d, 0x85, - 0xa2, 0x6f, 0x89, 0xe1, 0x45, 0x94, 0xd2, 0xd3, 0xcc, 0xe7, 0x06, 0xfe, 0x6f, 0x16, 0xf2, 0xca, - 0xa6, 0x98, 0x4d, 0xed, 0x66, 0x34, 0x9b, 0xda, 0xcd, 0xa5, 0xed, 0x30, 0x77, 0xa7, 0xec, 0xe2, - 0x9d, 0x7e, 0x0c, 0x1b, 0xf5, 0x29, 0x75, 0x5c, 0x7a, 0xe5, 0xb8, 0x0e, 0xbf, 0x95, 0xe9, 0xa9, - 0xd4, 0xee, 0x27, 0x77, 0x3b, 0xa0, 0x29, 0x31, 0x99, 0x51, 0x46, 0x4f, 0x01, 0xe2, 0x82, 0x09, - 0xad, 0x75, 0x19, 0x16, 0x3b, 0x75, 0x34, 0x11, 0xaa, 0xa0, 0xa4, 0xb4, 0xd1, 0x67, 0x50, 0x8a, - 0xc2, 0x16, 0x5a, 0x79, 0x79, 0xf4, 0x83, 0xd4, 0xd1, 0x58, 0xa6, 0x4e, 0x26, 0xba, 0xa2, 0x99, - 0xeb, 0xae, 0x43, 0x43, 0x16, 0x5a, 0x85, 0x87, 0x59, 0xd1, 0xcc, 0x9a, 0xb4, 0x3b, 0x70, 0x67, - 0xce, 0xe2, 0x92, 0x98, 0x7f, 0x34, 0x1b, 0xf3, 0x4d, 0x61, 0x33, 0x3e, 0x95, 0x0a, 0xb5, 0x7d, - 0x0e, 0x95, 0x59, 0x27, 0x96, 0x80, 0x3d, 0x9a, 0x05, 0x43, 0x8b, 0x25, 0x91, 0x4e, 0xde, 0x33, - 0xd8, 0x48, 0x07, 0x13, 0x95, 0x60, 0x9d, 0xba, 0xe3, 0x6b, 0x6a, 0xae, 0xa1, 0x22, 0xe4, 0xae, - 0x18, 0xa7, 0xa6, 0x81, 0x00, 0xf2, 0x21, 0xa7, 0x57, 0x2e, 0x33, 0x33, 0xa8, 0x0c, 0x85, 0x3e, - 0x1b, 0xd0, 0x89, 0xcb, 0xcd, 0x2c, 0xfe, 0x2e, 0x6c, 0x29, 0xe8, 0x8e, 0x13, 0x72, 0xc2, 0x7e, - 0x33, 0x61, 0x21, 0x17, 0x2e, 0x51, 0xd7, 0x95, 0x2e, 0x15, 0x89, 0xf8, 0xc4, 0x17, 0x80, 0xd2, - 0x6a, 0x7a, 0x3e, 0x58, 0x50, 0x68, 0x2a, 0x24, 0xed, 0x7e, 0x44, 0xa2, 0x8f, 0xa1, 0xa0, 0xf4, - 0x43, 0x2b, 0x23, 0xb3, 0x00, 0xc9, 0x25, 0x48, 0x24, 0xc2, 0x7f, 0xc8, 0x42, 0xa1, 0xe1, 0x4e, - 0x42, 0x31, 0x19, 0xe6, 0x0b, 0x0f, 0x43, 0xbe, 0xcb, 0x29, 0x9f, 0x84, 0x32, 0x0a, 0x15, 0x05, - 0xa0, 0x38, 0x44, 0x4b, 0xd0, 0x4e, 0x54, 0xb6, 0xba, 0x06, 0xa3, 0x22, 0x16, 0x1d, 0xfe, 0xd2, - 0x63, 0x81, 0x9e, 0xcb, 0x8a, 0x10, 0xab, 0xb5, 0x11, 0x30, 0xca, 0x59, 0xff, 0x4c, 0xad, 0xb2, - 0xb7, 0xac, 0xd6, 0x58, 0x19, 0x3d, 0x93, 0x05, 0xcf, 0x03, 0xff, 0x56, 0x9e, 0xcd, 0xbf, 0xf5, - 0x6c, 0x5a, 0x1d, 0xfd, 0x08, 0x8a, 0x1d, 0x67, 0xc0, 0xc2, 0x31, 0xf5, 0xe4, 0x74, 0x11, 0x25, - 0x39, 0x7f, 0xb4, 0xa9, 0xdf, 0x1b, 0x24, 0x56, 0x9d, 0xef, 0xb2, 0xe2, 0x62, 0x97, 0x99, 0x90, - 0xbd, 0x24, 0x1d, 0xab, 0xa4, 0x2a, 0xe7, 0x92, 0x74, 0x44, 0x42, 0x1a, 0xbe, 0xe7, 0xb1, 0x1e, - 0xb7, 0x40, 0x25, 0x44, 0x93, 0xe8, 0x93, 0x99, 0xa6, 0x2a, 0xcb, 0x9c, 0xcc, 0x55, 0x69, 0x4a, - 0x01, 0x7f, 0x0d, 0x48, 0x27, 0xe6, 0x8d, 0x75, 0x21, 0x0c, 0x32, 0xb9, 0x3f, 0xfa, 0x32, 0x4d, - 0x45, 0x12, 0x91, 0x22, 0x37, 0xe3, 0x80, 0x0d, 0x9c, 0x6f, 0xa3, 0xdc, 0x28, 0x0a, 0x7f, 0x09, - 0x77, 0x67, 0x90, 0x75, 0x29, 0x7d, 0x0f, 0x8a, 0x9a, 0x1d, 0x5a, 0x86, 0xf4, 0xae, 0x2c, 0xbc, - 0xd3, 0x3c, 0x12, 0x0b, 0xf1, 0x9f, 0x0d, 0xb8, 0x13, 0xc5, 0x28, 0xf2, 0x6b, 0xee, 0x41, 0x35, - 0x13, 0xf1, 0xcc, 0xbb, 0x47, 0xbc, 0x06, 0xf9, 0x11, 0xe3, 0xd7, 0x7e, 0x5f, 0xba, 0x5c, 0x51, - 0x43, 0x67, 0xce, 0xd6, 0xc1, 0x89, 0xd4, 0x20, 0x5a, 0x13, 0x3f, 0x86, 0xbc, 0xe2, 0x88, 0xb6, - 0x22, 0xad, 0xf3, 0x4e, 0xbd, 0xd1, 0x32, 0xd7, 0x50, 0x01, 0xb2, 0xf5, 0x66, 0xd3, 0x34, 0xd0, - 0x06, 0x14, 0xbb, 0x97, 0x87, 0x17, 0xa4, 0xde, 0xb8, 0x30, 0x33, 0xf8, 0x2f, 0x19, 0xd8, 0x56, - 0x65, 0x15, 0x5d, 0x2c, 0xb9, 0xc1, 0x4c, 0xf5, 0xbf, 0xe7, 0x0d, 0x8e, 0x67, 0xb2, 0xac, 0x36, - 0xca, 0x23, 0x19, 0xc7, 0x25, 0x46, 0xdf, 0x38, 0x48, 0xe7, 0xaa, 0x2f, 0xb7, 0x58, 0x7d, 0x16, - 0x14, 0x4e, 0xfd, 0xae, 0x4b, 0x7b, 0x37, 0x7a, 0xc3, 0x46, 0xa4, 0x90, 0xc8, 0x8f, 0xe6, 0x89, - 0x6c, 0x95, 0x22, 0x89, 0x48, 0xfb, 0x8b, 0x77, 0x99, 0xa5, 0xdb, 0xe9, 0xf1, 0x57, 0x4a, 0x8f, - 0xba, 0x01, 0x14, 0xff, 0xcf, 0x65, 0xab, 0x5b, 0x26, 0x9b, 0xb4, 0x0c, 0x82, 0xdc, 0x89, 0xdf, - 0x57, 0x4f, 0xb8, 0x75, 0x22, 0xbf, 0xf1, 0x97, 0x60, 0xea, 0x50, 0x25, 0x0b, 0x62, 0x3f, 0xbd, - 0x59, 0x54, 0x85, 0x6e, 0x88, 0xc8, 0xc6, 0x23, 0x39, 0x11, 0xe3, 0xd7, 0x90, 0xed, 0xf8, 0xc3, - 0xa5, 0x2e, 0xfe, 0x10, 0x0a, 0x5d, 0x4e, 0x03, 0xae, 0x1b, 0xe6, 0xcd, 0x63, 0x24, 0x52, 0x15, - 0x48, 0x87, 0x7e, 0xff, 0x56, 0xfa, 0xbd, 0x41, 0xe4, 0xb7, 0x88, 0xf2, 0x09, 0x0b, 0x43, 0x3a, - 0x8c, 0x9f, 0x9f, 0x9a, 0xc4, 0xdf, 0x87, 0x8d, 0x8e, 0x3f, 0x0c, 0xe3, 0xde, 0x7a, 0x00, 0x39, - 0x41, 0x6b, 0xaf, 0x0b, 0xb2, 0xaa, 0xfd, 0x21, 0x91, 0x4c, 0xfc, 0x19, 0x6c, 0x35, 0x5c, 0xe7, - 0x72, 0x3c, 0x0c, 0x68, 0x9f, 0xa5, 0xca, 0xd1, 0x0f, 0xa3, 0x72, 0xf4, 0x43, 0x61, 0x9f, 0x06, - 0xbd, 0xeb, 0xe8, 0x15, 0x20, 0xbe, 0x71, 0x4d, 0x8c, 0x88, 0xe4, 0xa0, 0xb6, 0xb5, 0x0b, 0xa5, - 0x81, 0xe3, 0xb2, 0xc6, 0xf5, 0xc4, 0xbb, 0x91, 0x00, 0x1b, 0x24, 0x61, 0xe0, 0x5f, 0x42, 0xb9, - 0xed, 0x0d, 0x02, 0xaa, 0xe7, 0xf7, 0x63, 0xd8, 0x3a, 0xa1, 0x8e, 0xc7, 0x99, 0x47, 0x3d, 0xf1, - 0xa0, 0xe4, 0xce, 0x94, 0xe9, 0xe9, 0xb2, 0x28, 0x40, 0x7b, 0x00, 0x92, 0x49, 0x1d, 0x31, 0xda, - 0x95, 0x2b, 0x29, 0xce, 0xfe, 0xcf, 0xa2, 0x8d, 0x21, 0xb6, 0xdd, 0x51, 0xbd, 0xdd, 0x69, 0x35, - 0xcd, 0x35, 0xd1, 0x80, 0x0d, 0xd2, 0xaa, 0x5f, 0xb4, 0x4f, 0x9f, 0x9b, 0x86, 0x58, 0x8e, 0xa4, - 0x55, 0x6f, 0x7e, 0x63, 0x66, 0x50, 0x05, 0xa0, 0xd9, 0xea, 0x5e, 0x90, 0xb3, 0x6f, 0x84, 0x28, - 0x2b, 0x14, 0x8f, 0xda, 0xa7, 0xed, 0xee, 0x71, 0xab, 0x69, 0xe6, 0x6a, 0x5f, 0x43, 0x45, 0xff, - 0xe6, 0xe8, 0xe7, 0x2e, 0x3a, 0x02, 0x78, 0xce, 0x78, 0xf4, 0xef, 0xb3, 0xe2, 0x55, 0x65, 0xcb, - 0xa9, 0xa5, 0x95, 0xf0, 0xdd, 0xdf, 0xfd, 0xe3, 0x5f, 0xbf, 0xcf, 0x6c, 0xa2, 0x72, 0x75, 0xfa, - 0xa4, 0x3a, 0x55, 0xcc, 0xda, 0x7f, 0x0c, 0x28, 0x8b, 0xbf, 0x93, 0x08, 0xf7, 0x18, 0xf2, 0xea, - 0x4f, 0x69, 0x25, 0xa6, 0x7c, 0x00, 0xcc, 0xfe, 0x4d, 0x61, 0x24, 0xa1, 0x37, 0x10, 0x08, 0xe8, - 0x97, 0xea, 0xfc, 0xcf, 0xa1, 0xac, 0xfa, 0x5c, 0xbe, 0xbc, 0xd1, 0x92, 0xc7, 0xba, 0xbd, 0x25, - 0x78, 0x33, 0x8f, 0x7c, 0xfc, 0x40, 0x22, 0xdd, 0xc3, 0xa6, 0x40, 0xe2, 0x42, 0xf4, 0x49, 0x4f, - 0xa2, 0x3c, 0x35, 0xf6, 0xd1, 0xb1, 0x7e, 0xd3, 0xaf, 0xf4, 0x6d, 0x09, 0xe0, 0xb6, 0x04, 0xac, - 0xe0, 0x52, 0x0c, 0xf8, 0xd4, 0xd8, 0xaf, 0xfd, 0xd1, 0x80, 0x4d, 0xb5, 0x9e, 0xa3, 0x8b, 0xb7, - 0x21, 0x27, 0x56, 0x00, 0xba, 0x97, 0x3c, 0x0d, 0x52, 0xcb, 0xc6, 0xde, 0x99, 0x67, 0x2f, 0xbb, - 0xf9, 0x40, 0x2d, 0xfc, 0x2f, 0x20, 0xd7, 0xf6, 0x06, 0x3e, 0x32, 0xc5, 0x99, 0xf4, 0xbf, 0xb6, - 0x9d, 0x7a, 0x77, 0xe0, 0xfb, 0xf2, 0xe4, 0x16, 0xba, 0x93, 0x9c, 0xac, 0xbe, 0x72, 0xfa, 0xaf, - 0x6b, 0x7f, 0xcd, 0x41, 0x45, 0x37, 0x7c, 0xe4, 0xdc, 0x4f, 0x56, 0x22, 0xa6, 0xf7, 0x12, 0xb6, - 0x24, 0x24, 0x42, 0x32, 0x78, 0x3d, 0xc5, 0x94, 0x98, 0xa8, 0xa3, 0x6f, 0xb7, 0x93, 0x52, 0x4f, - 0x5f, 0xef, 0xfe, 0x02, 0x5f, 0xdf, 0x6f, 0xa6, 0x68, 0x34, 0x24, 0xfa, 0x75, 0xb2, 0x0f, 0xd0, - 0xdd, 0x25, 0x6b, 0xc9, 0x5e, 0xbd, 0x1e, 0xf0, 0xc7, 0x12, 0x70, 0x0f, 0x7f, 0x30, 0xef, 0x63, - 0xd5, 0xd5, 0x20, 0x22, 0xd3, 0x1d, 0xc8, 0xab, 0xe2, 0x41, 0xd6, 0xaa, 0x85, 0x61, 0x2f, 0x04, - 0x03, 0xef, 0x48, 0x6c, 0x13, 0xa7, 0x9d, 0x15, 0x68, 0x2f, 0x52, 0xd3, 0x72, 0x49, 0x0c, 0xb7, - 0x53, 0x97, 0x4f, 0xc6, 0x26, 0x96, 0x60, 0xbb, 0xc8, 0x5e, 0x70, 0x94, 0xc6, 0x58, 0x1d, 0xc8, - 0x37, 0x99, 0xcb, 0x38, 0x5b, 0x82, 0xba, 0xa2, 0x46, 0xa3, 0x24, 0xed, 0x2f, 0x26, 0xa9, 0xad, - 0x26, 0xe3, 0x12, 0x2c, 0x53, 0x4f, 0xc9, 0x78, 0x8a, 0xe2, 0x0f, 0x25, 0xca, 0x7d, 0x74, 0x6f, - 0x31, 0x8c, 0xfe, 0x30, 0xac, 0x8d, 0x00, 0x1a, 0xae, 0x13, 0x95, 0xcf, 0xaf, 0xa0, 0xa0, 0x27, - 0xa3, 0x2a, 0xef, 0x85, 0x11, 0x6b, 0xef, 0xcc, 0xb3, 0xb5, 0x99, 0x8f, 0xa4, 0x99, 0x0f, 0xd1, - 0x03, 0x65, 0xc6, 0xa9, 0xbe, 0xf2, 0xc3, 0xd7, 0xd5, 0x57, 0x62, 0xe4, 0xbe, 0xae, 0x4e, 0x94, - 0xf2, 0xa7, 0x46, 0xed, 0xdf, 0x06, 0xa0, 0xd4, 0x28, 0x4d, 0x86, 0x49, 0xe9, 0x39, 0xe3, 0xd1, - 0xf3, 0x78, 0x45, 0xcf, 0xde, 0x11, 0xa6, 0x53, 0x87, 0x67, 0x5b, 0x2a, 0x54, 0x87, 0x7f, 0x0a, - 0x65, 0xc2, 0xc2, 0xf7, 0xc6, 0xda, 0x4f, 0x63, 0xd5, 0xa1, 0xd4, 0x8d, 0x91, 0xe6, 0x4f, 0xac, - 0x84, 0xb0, 0x53, 0x10, 0x87, 0xb9, 0x5f, 0x64, 0xa6, 0x4f, 0xae, 0xf2, 0xd2, 0xfa, 0x0f, 0xfe, - 0x17, 0x00, 0x00, 0xff, 0xff, 0xac, 0x70, 0xde, 0x7a, 0xe1, 0x13, 0x00, 0x00, + // 1914 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x5b, 0x73, 0x1b, 0x49, + 0x15, 0xf6, 0x48, 0xb2, 0x2e, 0x47, 0xb6, 0x22, 0x77, 0x1c, 0x67, 0x76, 0xe2, 0x35, 0xa9, 0xde, + 0xa5, 0x48, 0x99, 0xac, 0xb5, 0x11, 0x50, 0xbb, 0x15, 0xb2, 0x4b, 0xc9, 0x92, 0x1c, 0x0b, 0xe4, + 0x0b, 0x6d, 0x7b, 0xb3, 0x0b, 0x0f, 0xd0, 0x96, 0x5a, 0xf6, 0x94, 0x47, 0xd3, 0x62, 0xa6, 0xa5, + 0xac, 0x2b, 0x15, 0x1e, 0xf8, 0x0b, 0x50, 0x45, 0xf1, 0x3f, 0x78, 0xa2, 0x78, 0xe1, 0x91, 0x47, + 0x8a, 0xe2, 0x1f, 0xf0, 0xca, 0x1b, 0x3f, 0x80, 0xea, 0xcb, 0x5c, 0x74, 0x4b, 0x52, 0xe1, 0x6d, + 0xce, 0xa5, 0xbf, 0x73, 0xfa, 0x5c, 0x7b, 0x60, 0x3d, 0x64, 0xc1, 0xc4, 0xed, 0xb1, 0xbd, 0x51, + 0xc0, 0x05, 0x47, 0x99, 0xc9, 0x13, 0x67, 0xfb, 0x8a, 0xf3, 0x2b, 0x8f, 0xd5, 0xe8, 0xc8, 0xad, + 0x51, 0xdf, 0xe7, 0x82, 0x0a, 0x97, 0xfb, 0xa1, 0xd6, 0x70, 0x76, 0x8c, 0x54, 0x51, 0x97, 0xe3, + 0x41, 0xad, 0x3f, 0x0e, 0x94, 0x82, 0x91, 0x3f, 0x98, 0x95, 0xb3, 0xe1, 0x48, 0xdc, 0x1a, 0xe1, + 0x77, 0x66, 0x85, 0xc2, 0x1d, 0xb2, 0x50, 0xd0, 0xe1, 0x48, 0x2b, 0xe0, 0x1d, 0x58, 0x23, 0x2c, + 0xe4, 0xe3, 0xa0, 0xc7, 0xf6, 0x6f, 0x3b, 0x2d, 0x54, 0x81, 0x8c, 0xdb, 0xb7, 0xad, 0x87, 0xd6, + 0xa3, 0x12, 0xc9, 0xb8, 0x7d, 0xfc, 0x0f, 0x0b, 0x0a, 0x5f, 0xb1, 0x20, 0x74, 0xb9, 0x8f, 0x3e, + 0x87, 0xd2, 0xfe, 0xd8, 0xf5, 0xfa, 0x2d, 0x2a, 0x98, 0x52, 0x29, 0xd7, 0x9d, 0x3d, 0x6d, 0x60, + 0x2f, 0x32, 0xb0, 0x77, 0x1e, 0x19, 0x20, 0x89, 0x32, 0xda, 0x86, 0xd2, 0x73, 0x57, 0x34, 0xf9, + 0x70, 0xe8, 0x0a, 0x3b, 0xa3, 0xc0, 0x13, 0x86, 0x92, 0x72, 0x63, 0xc4, 0xce, 0x1a, 0x69, 0xc4, + 0x40, 0x0e, 0x14, 0x4f, 0x3d, 0x2a, 0x06, 0x3c, 0x18, 0xda, 0x39, 0x25, 0x8c, 0x69, 0x64, 0xc7, + 0xce, 0xd9, 0xab, 0x4a, 0x54, 0x48, 0x9d, 0x7a, 0xc1, 0x83, 0x9b, 0x81, 0xc7, 0x5f, 0xda, 0x79, + 0x7d, 0x2a, 0xa2, 0xf1, 0x2b, 0xa8, 0xbc, 0xb8, 0xe6, 0x74, 0xe8, 0x12, 0x16, 0x8e, 0xb8, 0x1f, + 0x32, 0xb4, 0x03, 0xb9, 0x8b, 0x90, 0x05, 0xe6, 0x52, 0xc5, 0xbd, 0xc9, 0x93, 0x3d, 0x49, 0x1f, + 0xae, 0x10, 0xc5, 0x47, 0xcf, 0xa0, 0x72, 0xa6, 0xd3, 0xd6, 0xe8, 0xf5, 0xf8, 0xd8, 0xd7, 0x97, + 0x28, 0xd7, 0x91, 0xd4, 0x9c, 0x96, 0x1c, 0xae, 0x90, 0x19, 0xdd, 0xfd, 0x32, 0x94, 0x46, 0x81, + 0xeb, 0xf7, 0xdc, 0x11, 0xf5, 0xf0, 0x6f, 0xb5, 0x29, 0x54, 0x87, 0x7c, 0xfb, 0xdb, 0x91, 0x1b, + 0xdc, 0xbe, 0x43, 0x24, 0x8d, 0x26, 0x42, 0x90, 0x3b, 0xa6, 0x43, 0x66, 0x22, 0xa8, 0xbe, 0xd1, + 0x26, 0xac, 0xb6, 0x87, 0xd4, 0xf5, 0x4c, 0xe0, 0x34, 0x21, 0x03, 0x73, 0xea, 0xf6, 0xc4, 0x38, + 0x60, 0x26, 0x66, 0x11, 0x89, 0xff, 0x6c, 0xcd, 0xde, 0x25, 0x86, 0xb5, 0x52, 0xb0, 0x0f, 0xa1, + 0xdc, 0x62, 0x61, 0x2f, 0x70, 0x47, 0xb2, 0xd4, 0x8c, 0xc5, 0x34, 0x6b, 0x89, 0x61, 0x07, 0x8a, + 0x9d, 0x30, 0x1c, 0xb3, 0x7e, 0x43, 0x28, 0xcb, 0x59, 0x12, 0xd3, 0x32, 0xcf, 0xc7, 0x5c, 0xec, + 0xb3, 0x01, 0x0f, 0x98, 0xca, 0x57, 0x96, 0x24, 0x0c, 0x29, 0x55, 0xd7, 0x64, 0x61, 0x43, 0xa8, + 0x94, 0x65, 0x49, 0xc2, 0xc0, 0x67, 0xb0, 0x7e, 0xce, 0x6f, 0x98, 0x1f, 0xa7, 0xec, 0x31, 0x14, + 0xa2, 0x5c, 0x58, 0xcb, 0x72, 0x41, 0x22, 0x15, 0xe9, 0xac, 0x3a, 0x6e, 0x2e, 0xa2, 0x09, 0xfc, + 0x2f, 0x0b, 0x4a, 0xa7, 0x34, 0xa0, 0x43, 0x26, 0x58, 0xf0, 0xfe, 0x61, 0xf8, 0x8a, 0x7a, 0x63, + 0x16, 0x85, 0x41, 0x11, 0x32, 0x0c, 0x27, 0x4a, 0x4e, 0x3d, 0x15, 0x86, 0x22, 0x89, 0x69, 0x15, + 0x22, 0x5f, 0xb0, 0x40, 0xca, 0x56, 0xb5, 0x2c, 0xa2, 0x25, 0xda, 0x49, 0xd0, 0x67, 0x81, 0x0a, + 0xc0, 0x2a, 0xd1, 0x84, 0xf4, 0xec, 0x90, 0x79, 0x23, 0xbb, 0xa0, 0x3d, 0x93, 0xdf, 0x12, 0xe5, + 0x20, 0xe0, 0xc3, 0x03, 0xd7, 0x63, 0x76, 0x51, 0xa3, 0x44, 0x34, 0xfe, 0xbb, 0x05, 0x95, 0x03, + 0x8f, 0x4e, 0x78, 0xd0, 0x08, 0x84, 0x3b, 0xa0, 0xbd, 0xf7, 0xcd, 0xf1, 0xa7, 0x90, 0x3b, 0xa7, + 0x57, 0xa1, 0x9d, 0x7d, 0x98, 0x7d, 0x54, 0xae, 0x6f, 0xcb, 0x08, 0x4f, 0xe3, 0xee, 0x49, 0x71, + 0xdb, 0x17, 0xc1, 0x2d, 0x51, 0x9a, 0xce, 0x09, 0x94, 0x62, 0x16, 0xaa, 0x42, 0xf6, 0x86, 0xdd, + 0x1a, 0x9b, 0xf2, 0x13, 0x3d, 0x86, 0xd5, 0x89, 0x8a, 0x96, 0xee, 0x9f, 0xad, 0xb9, 0xa2, 0x6f, + 0xcb, 0xe1, 0x45, 0xb4, 0xd2, 0xd3, 0xcc, 0xe7, 0x16, 0xfe, 0x43, 0x0e, 0xf2, 0xda, 0xa6, 0x9c, + 0x4d, 0x9d, 0x56, 0x34, 0x9b, 0x3a, 0xad, 0x85, 0xed, 0x30, 0x73, 0xa7, 0xec, 0xfc, 0x9d, 0x7e, + 0x0c, 0x6b, 0x8d, 0x09, 0x75, 0x3d, 0x7a, 0xe9, 0x7a, 0xae, 0xb8, 0x55, 0xe9, 0xa9, 0xd4, 0xef, + 0x27, 0x77, 0xdb, 0xa3, 0x29, 0x31, 0x99, 0x52, 0x46, 0x4f, 0x01, 0xe2, 0x82, 0x09, 0xed, 0x55, + 0x15, 0x16, 0x27, 0x75, 0x34, 0x11, 0xea, 0xa0, 0xa4, 0xb4, 0xd1, 0x67, 0x50, 0x8a, 0xc2, 0x16, + 0xda, 0x79, 0x75, 0xf4, 0x83, 0xd4, 0xd1, 0x58, 0xa6, 0x4f, 0x26, 0xba, 0xb2, 0x99, 0x1b, 0x9e, + 0x4b, 0x43, 0x16, 0xda, 0x85, 0x87, 0x59, 0xd9, 0xcc, 0x86, 0x54, 0xb3, 0x31, 0xe0, 0x13, 0x57, + 0x56, 0x4c, 0xd1, 0xcc, 0x46, 0x43, 0x3b, 0x5d, 0xb8, 0x33, 0xe3, 0xcd, 0x82, 0x7c, 0x7c, 0x34, + 0x9d, 0x8f, 0x75, 0xe9, 0x4f, 0x7c, 0x2a, 0x95, 0x06, 0xe7, 0x14, 0x2a, 0xd3, 0x0e, 0x2e, 0x00, + 0x7b, 0x34, 0x0d, 0x86, 0xe6, 0xcb, 0x25, 0x9d, 0xd8, 0x67, 0xb0, 0x96, 0x0e, 0x34, 0x2a, 0xc1, + 0x2a, 0xf5, 0x46, 0xd7, 0xb4, 0xba, 0x82, 0x8a, 0x90, 0xbb, 0x64, 0x82, 0x56, 0x2d, 0x04, 0x90, + 0x0f, 0x05, 0xbd, 0xf4, 0x58, 0x35, 0x83, 0xca, 0x50, 0xe8, 0xb3, 0x01, 0x1d, 0x7b, 0xa2, 0x9a, + 0xc5, 0xdf, 0x85, 0x0d, 0x0d, 0xdd, 0x75, 0x43, 0x41, 0xd8, 0x6f, 0xc6, 0x2c, 0x14, 0xd2, 0x25, + 0xea, 0x79, 0xca, 0xa5, 0x22, 0x91, 0x9f, 0xf8, 0x1c, 0x50, 0x5a, 0xcd, 0xcc, 0x0e, 0x1b, 0x0a, + 0x2d, 0x8d, 0x64, 0xdc, 0x8f, 0x48, 0xf4, 0x31, 0x14, 0xb4, 0x7e, 0x68, 0x67, 0x54, 0x86, 0x20, + 0xb9, 0x04, 0x89, 0x44, 0xf8, 0x8f, 0x59, 0x28, 0x34, 0xbd, 0x71, 0x28, 0xa7, 0xc6, 0x6c, 0x51, + 0x62, 0xc8, 0x9f, 0x09, 0x2a, 0xc6, 0xa1, 0x8a, 0x42, 0x45, 0x03, 0x68, 0x0e, 0x31, 0x12, 0xb4, + 0x15, 0x95, 0xb4, 0xa9, 0xcf, 0xa8, 0xc0, 0x65, 0xf7, 0xbf, 0xf4, 0x59, 0x60, 0x66, 0xb6, 0x26, + 0xe4, 0xda, 0x6d, 0x06, 0x8c, 0x0a, 0xd6, 0x3f, 0xd1, 0x6b, 0xee, 0x2d, 0x6b, 0x37, 0x56, 0x46, + 0xcf, 0x54, 0x33, 0x88, 0x80, 0xdf, 0xaa, 0xb3, 0xf9, 0xb7, 0x9e, 0x4d, 0xab, 0xa3, 0x1f, 0x41, + 0xb1, 0xeb, 0x0e, 0x58, 0x38, 0xa2, 0xbe, 0x9a, 0x3c, 0xb2, 0x5c, 0x67, 0x8f, 0xb6, 0xcc, 0x5b, + 0x84, 0xc4, 0xaa, 0xb3, 0x1d, 0x58, 0x9c, 0xef, 0xc0, 0x2a, 0x64, 0x2f, 0x48, 0xd7, 0x2e, 0xe9, + 0xca, 0xb9, 0x20, 0x5d, 0x99, 0x90, 0x26, 0xf7, 0x7d, 0xd6, 0x13, 0x36, 0xe8, 0x84, 0x18, 0x12, + 0x7d, 0x32, 0xd5, 0x70, 0x65, 0x95, 0x93, 0x99, 0x2a, 0x4d, 0x29, 0xe0, 0xaf, 0x01, 0x99, 0xc4, + 0xbc, 0xb1, 0x2e, 0xa4, 0x41, 0xa6, 0x76, 0x4b, 0x5f, 0xa5, 0xa9, 0x48, 0x22, 0x52, 0xe6, 0x66, + 0x14, 0xb0, 0x81, 0xfb, 0x6d, 0x94, 0x1b, 0x4d, 0xe1, 0x2f, 0xe1, 0xee, 0x14, 0xb2, 0x29, 0xa5, + 0xef, 0x41, 0xd1, 0xb0, 0x43, 0xdb, 0x52, 0xde, 0x95, 0xa5, 0x77, 0x86, 0x47, 0x62, 0x21, 0xfe, + 0x8b, 0x05, 0x77, 0xa2, 0x18, 0x45, 0x7e, 0xcd, 0x3c, 0xb6, 0xa6, 0x22, 0x9e, 0x79, 0xf7, 0x88, + 0xd7, 0x21, 0x3f, 0x64, 0xe2, 0x9a, 0xf7, 0x95, 0xcb, 0x15, 0x3d, 0x90, 0x66, 0x6c, 0xed, 0x1d, + 0x29, 0x0d, 0x62, 0x34, 0xf1, 0x63, 0xc8, 0x6b, 0x8e, 0x6c, 0x2b, 0xd2, 0x3e, 0xed, 0x36, 0x9a, + 0xed, 0xea, 0x0a, 0x2a, 0x40, 0xb6, 0xd1, 0x6a, 0x55, 0x2d, 0xb4, 0x06, 0xc5, 0xb3, 0x8b, 0xfd, + 0x73, 0xd2, 0x68, 0x9e, 0x57, 0x33, 0xf8, 0xaf, 0x19, 0xd8, 0xd4, 0x65, 0x15, 0x5d, 0x2c, 0xb9, + 0xc1, 0x54, 0xf5, 0xbf, 0xe7, 0x0d, 0x0e, 0xa7, 0xb2, 0xac, 0xb7, 0xcd, 0x23, 0x15, 0xc7, 0x05, + 0x46, 0xdf, 0x38, 0x64, 0x67, 0xaa, 0x2f, 0x37, 0x5f, 0x7d, 0x36, 0x14, 0x8e, 0xf9, 0x99, 0x47, + 0x7b, 0x37, 0x66, 0xfb, 0x46, 0xa4, 0x94, 0xa8, 0x8f, 0xd6, 0x91, 0x6a, 0x95, 0x22, 0x89, 0x48, + 0xe7, 0x8b, 0x77, 0x99, 0xa5, 0x9b, 0xe9, 0xf1, 0x57, 0x4a, 0x8f, 0xba, 0x01, 0x14, 0xff, 0xcf, + 0x45, 0x6c, 0x5a, 0x26, 0x9b, 0xb4, 0x0c, 0x82, 0xdc, 0x11, 0xef, 0xeb, 0xe7, 0xdd, 0x2a, 0x51, + 0xdf, 0xf8, 0x4b, 0xa8, 0x9a, 0x50, 0x25, 0xcb, 0x63, 0x37, 0xbd, 0x75, 0x74, 0x85, 0xae, 0xc9, + 0xc8, 0xc6, 0x23, 0x39, 0x11, 0xe3, 0xd7, 0x90, 0xed, 0xf2, 0xab, 0x85, 0x2e, 0xfe, 0x10, 0x0a, + 0x67, 0x82, 0x06, 0xc2, 0x34, 0xcc, 0x9b, 0xc7, 0x48, 0xa4, 0x2a, 0x91, 0xf6, 0x79, 0xff, 0x56, + 0xf9, 0xbd, 0x46, 0xd4, 0xb7, 0x8c, 0xf2, 0x11, 0x0b, 0x43, 0x7a, 0x15, 0x3f, 0x4d, 0x0d, 0x89, + 0xbf, 0x0f, 0x6b, 0x5d, 0x7e, 0x15, 0xc6, 0xbd, 0xf5, 0x00, 0x72, 0x92, 0x36, 0x5e, 0x17, 0x54, + 0x55, 0xf3, 0x2b, 0xa2, 0x98, 0xf8, 0x33, 0xd8, 0x68, 0x7a, 0xee, 0xc5, 0xe8, 0x2a, 0xa0, 0x7d, + 0x96, 0x2a, 0x47, 0x1e, 0x46, 0xe5, 0xc8, 0x43, 0x69, 0x9f, 0x06, 0xbd, 0xeb, 0xe8, 0x85, 0x20, + 0xbf, 0x71, 0x5d, 0x8e, 0x88, 0xe4, 0xa0, 0xb1, 0xb5, 0x0d, 0xa5, 0x81, 0xeb, 0xb1, 0xe6, 0xf5, + 0xd8, 0xbf, 0x51, 0x00, 0x6b, 0x24, 0x61, 0xe0, 0x5f, 0x42, 0xb9, 0xe3, 0x0f, 0x02, 0x6a, 0xe6, + 0xf7, 0x63, 0xd8, 0x38, 0xa2, 0xae, 0x2f, 0x98, 0x4f, 0x7d, 0xf9, 0xd8, 0x14, 0xee, 0x84, 0x99, + 0xe9, 0x32, 0x2f, 0x40, 0x3b, 0x00, 0x8a, 0x49, 0x5d, 0x39, 0xda, 0xb5, 0x2b, 0x29, 0xce, 0xee, + 0xcf, 0xa2, 0x8d, 0x21, 0xb7, 0xdd, 0x41, 0xa3, 0xd3, 0x6d, 0xb7, 0xaa, 0x2b, 0xb2, 0x01, 0x9b, + 0xa4, 0xdd, 0x38, 0xef, 0x1c, 0x3f, 0xaf, 0x5a, 0x72, 0x39, 0x92, 0x76, 0xa3, 0xf5, 0x4d, 0x35, + 0x83, 0x2a, 0x00, 0xad, 0xf6, 0xd9, 0x39, 0x39, 0xf9, 0x46, 0x8a, 0xb2, 0x52, 0xf1, 0xa0, 0x73, + 0xdc, 0x39, 0x3b, 0x6c, 0xb7, 0xaa, 0xb9, 0xfa, 0xd7, 0x50, 0x31, 0xbf, 0x40, 0xe6, 0x29, 0x8c, + 0x0e, 0x00, 0x9e, 0x33, 0x11, 0xfd, 0x17, 0x2d, 0x79, 0x71, 0x39, 0x6a, 0x6a, 0x19, 0x25, 0x7c, + 0xf7, 0x77, 0xff, 0xfc, 0xf7, 0xef, 0x33, 0xeb, 0xa8, 0x5c, 0x9b, 0x3c, 0xa9, 0x4d, 0x34, 0xb3, + 0xfe, 0x5f, 0x0b, 0xca, 0xf2, 0xcf, 0x25, 0xc2, 0x3d, 0x84, 0xbc, 0xfe, 0x8b, 0x5a, 0x8a, 0xa9, + 0x1e, 0x00, 0xd3, 0x7f, 0x5a, 0x18, 0x29, 0xe8, 0x35, 0x04, 0x12, 0xfa, 0xa5, 0x3e, 0xff, 0x73, + 0x28, 0xeb, 0x3e, 0x57, 0xaf, 0x72, 0xb4, 0xe0, 0x21, 0xef, 0x6c, 0x48, 0xde, 0xd4, 0x0f, 0x00, + 0x7e, 0xa0, 0x90, 0xee, 0xe1, 0xaa, 0x44, 0x12, 0x52, 0xf4, 0x49, 0x4f, 0xa1, 0x3c, 0xb5, 0x76, + 0xd1, 0xa1, 0x79, 0xef, 0x2f, 0xf5, 0x6d, 0x01, 0xe0, 0xa6, 0x02, 0xac, 0xe0, 0x52, 0x0c, 0xf8, + 0xd4, 0xda, 0xad, 0xff, 0xc9, 0x82, 0x75, 0xbd, 0x9e, 0xa3, 0x8b, 0x77, 0x20, 0x27, 0x57, 0x00, + 0xba, 0x97, 0x3c, 0x0d, 0x52, 0xcb, 0xc6, 0xd9, 0x9a, 0x65, 0x2f, 0xba, 0xf9, 0x40, 0x2f, 0xfc, + 0x2f, 0x20, 0xd7, 0xf1, 0x07, 0x1c, 0x55, 0xe5, 0x99, 0xf4, 0x7f, 0xb8, 0x93, 0x7a, 0x77, 0xe0, + 0xfb, 0xea, 0xe4, 0x06, 0xba, 0x93, 0x9c, 0xac, 0xbd, 0x72, 0xfb, 0xaf, 0xeb, 0x7f, 0xcb, 0x41, + 0xc5, 0x34, 0x7c, 0xe4, 0xdc, 0x4f, 0x96, 0x22, 0xa6, 0xf7, 0x12, 0xb6, 0x15, 0x24, 0x42, 0x2a, + 0x78, 0x3d, 0xcd, 0x54, 0x98, 0xa8, 0x6b, 0x6e, 0xb7, 0x95, 0x52, 0x4f, 0x5f, 0xef, 0xfe, 0x1c, + 0xdf, 0xdc, 0x6f, 0xaa, 0x68, 0x0c, 0x24, 0xfa, 0x75, 0xb2, 0x0f, 0xd0, 0xdd, 0x05, 0x6b, 0xc9, + 0x59, 0xbe, 0x1e, 0xf0, 0xc7, 0x0a, 0x70, 0x07, 0x7f, 0x30, 0xeb, 0x63, 0xcd, 0x33, 0x20, 0x32, + 0xd3, 0x5d, 0xc8, 0xeb, 0xe2, 0x41, 0xf6, 0xb2, 0x85, 0xe1, 0xcc, 0x05, 0x03, 0x6f, 0x29, 0xec, + 0x2a, 0x4e, 0x3b, 0x2b, 0xd1, 0x5e, 0xa4, 0xa6, 0xe5, 0x82, 0x18, 0x6e, 0xa6, 0x2e, 0x9f, 0x8c, + 0x4d, 0xac, 0xc0, 0xb6, 0x91, 0x33, 0xe7, 0x28, 0x8d, 0xb1, 0xba, 0x90, 0x6f, 0x31, 0x8f, 0x09, + 0xb6, 0x00, 0x75, 0x49, 0x8d, 0x46, 0x49, 0xda, 0x9d, 0x4f, 0x52, 0x47, 0x4f, 0xc6, 0x05, 0x58, + 0x55, 0x33, 0x25, 0xe3, 0x29, 0x8a, 0x3f, 0x54, 0x28, 0xf7, 0xd1, 0xbd, 0xf9, 0x30, 0xf2, 0xab, + 0xb0, 0x3e, 0x04, 0x68, 0x7a, 0x6e, 0x54, 0x3e, 0xbf, 0x82, 0x82, 0x99, 0x8c, 0xba, 0xbc, 0xe7, + 0x46, 0xac, 0xb3, 0x35, 0xcb, 0x36, 0x66, 0x3e, 0x52, 0x66, 0x3e, 0x44, 0x0f, 0xb4, 0x19, 0xb7, + 0xf6, 0x8a, 0x87, 0xaf, 0x6b, 0xaf, 0xe4, 0xc8, 0x7d, 0x5d, 0x1b, 0x6b, 0xe5, 0x4f, 0xad, 0xfa, + 0x7f, 0x2c, 0x40, 0xa9, 0x51, 0x9a, 0x0c, 0x93, 0xd2, 0x73, 0x26, 0xa2, 0xe7, 0xf1, 0x92, 0x9e, + 0xbd, 0x23, 0x4d, 0xa7, 0x0e, 0x4f, 0xb7, 0x54, 0xa8, 0x0f, 0xff, 0x14, 0xca, 0x84, 0x85, 0xef, + 0x8d, 0xb5, 0x9b, 0xc6, 0x6a, 0x40, 0xe9, 0x2c, 0x46, 0x9a, 0x3d, 0xb1, 0x14, 0xc2, 0x49, 0x41, + 0xec, 0xe7, 0x7e, 0x91, 0x99, 0x3c, 0xb9, 0xcc, 0x2b, 0xeb, 0x3f, 0xf8, 0x5f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xac, 0xc1, 0x13, 0x62, 0xfd, 0x13, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/generated/api/v1/service.swagger.json b/generated/api/v1/service.swagger.json index 8c6c456ff..6f77d66f1 100644 --- a/generated/api/v1/service.swagger.json +++ b/generated/api/v1/service.swagger.json @@ -662,6 +662,10 @@ "type": "string" }, "description": "Aliases are alternative IDs of the flavor." + }, + "Provider": { + "type": "string", + "description": "(cloud) Provider is a human readable name of the provider." } }, "description": "Flavor represents a configured cluster flavor." diff --git a/proto/api/v1/service.proto b/proto/api/v1/service.proto index 24208b320..26fdd1e5e 100644 --- a/proto/api/v1/service.proto +++ b/proto/api/v1/service.proto @@ -200,6 +200,9 @@ message Flavor { // Aliases are alternative IDs of the flavor. repeated string Aliases = 7; + + // (cloud) Provider is a human readable name of the provider. + string Provider = 8; } // FlavorListRequest represents a request to FlavorService.List. From 1bc967283137af86603d3df47c9765d218f28032 Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Thu, 22 Feb 2024 20:00:29 -0700 Subject: [PATCH 3/4] directly use provider value from template --- flavor/workflow_templates.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flavor/workflow_templates.go b/flavor/workflow_templates.go index 0292820f1..0d9c28deb 100644 --- a/flavor/workflow_templates.go +++ b/flavor/workflow_templates.go @@ -123,7 +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.Provider, + Provider: template.ObjectMeta.Annotations["infra.stackrox.io/provider"], Parameters: getParametersFromWorkflowTemplate(template), Artifacts: make(map[string]*v1.FlavorArtifact), } From 253c604b1681c5b5128660ef3ad4fdaa24046bac Mon Sep 17 00:00:00 2001 From: davdhacs <105243888+davdhacs@users.noreply.github.com> Date: Thu, 22 Feb 2024 21:59:41 -0700 Subject: [PATCH 4/4] fix test --- flavor/workflow_templates.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flavor/workflow_templates.bats b/flavor/workflow_templates.bats index a7f07d906..da82ff5d4 100755 --- a/flavor/workflow_templates.bats +++ b/flavor/workflow_templates.bats @@ -56,7 +56,7 @@ setup_file() { @test "provider is set" { flavor="$(infractl flavor get test-gke-lite --json)" assert_success - availability="$(echo "$flavor" | jq -r '.Provider')" + provider="$(echo "$flavor" | jq -r '.Provider')" assert_equal "$provider" "gcp" }