Correction after review

capactio · Feb 15, 2022 · 354571f · 354571f
1 parent f7d2711
commit 354571f
Show file tree

Hide file tree

Showing 25 changed files with 271 additions and 86 deletions.
diff --git a/cmd/argo-actions/README.md b/cmd/argo-actions/README.md
@@ -35,6 +35,7 @@ The following environment variables can be set:
 |--------------------------|----------|-------------------------------------------------|--------------------------------------------------------|
 | APP_ACTION | yes | | Defines action to perform |
 | APP_LOCAL_HUB_ENDPOINT | no | http://capact-hub-local.capact-system/graphql | Defines local Hub Endpoint |
+| APP_PUBLIC_HUB_ENDPOINT | no | http://capact-hub-public.capact-system/graphql | Defines public Hub Endpoint |
 | APP_DOWNLOAD_CONFIG | no | | For download action defines Type Instances to download |
 | APP_LOGGER_DEV_MODE | no | `false` | Enable additional log messages |
 

diff --git a/cmd/argo-actions/main.go b/cmd/argo-actions/main.go
@@ -40,19 +40,16 @@ func main() {
  logger, err := logger.New(cfg.Logger)
  exitOnError(err, "while creating zap logger")
 
- localClient := local.NewDefaultClient(cfg.LocalHubEndpoint)
- publicClient := public.NewDefaultClient(cfg.PublicHubEndpoint)
-
  // TODO: Consider using connection `hubclient.New` and route requests through Gateway
  client := hubclient.Client{
- Local: localClient,
- Public: publicClient,
+ Local: local.NewDefaultClient(cfg.LocalHubEndpoint),
+ Public: public.NewDefaultClient(cfg.PublicHubEndpoint),
  }
 
  switch cfg.Action {
  case argoactions.DownloadAction:
  log := logger.With(zap.String("Action", argoactions.DownloadAction))
- action = argoactions.NewDownloadAction(log, localClient, cfg.DownloadConfig)
+ action = argoactions.NewDownloadAction(log, &client, cfg.DownloadConfig)
 
  case argoactions.UploadAction:
  log := logger.With(zap.String("Action", argoactions.UploadAction))

diff --git a/cmd/k8s-engine/main.go b/cmd/k8s-engine/main.go
@@ -63,6 +63,9 @@ type Config struct {
 
  Logger logger.Config
 
+ LocalHubEndpoint string `envconfig:"default=http://capact-hub-local.capact-system/graphql"`
+ PublicHubEndpoint string `envconfig:"default=http://capact-hub-public.capact-system/graphql"`
+
  GraphQLGateway struct {
  Endpoint string `envconfig:"default=http://capact-gateway/graphql"`
  Username string
@@ -107,7 +110,7 @@ func main() {
  exitOnError(err, "while creating manager")
 
  hubClient := getHubClient(&cfg)
- typeInstanceHandler := argo.NewTypeInstanceHandler(cfg.HubActionsImage)
+ typeInstanceHandler := argo.NewTypeInstanceHandler(cfg.HubActionsImage, cfg.LocalHubEndpoint, cfg.PublicHubEndpoint)
  interfaceIOValidator := actionvalidation.NewValidator(hubClient)
  policyIOValidator := policyvalidation.NewValidator(hubClient)
  wfValidator := renderer.NewWorkflowInputValidator(interfaceIOValidator, policyIOValidator)

diff --git a/deploy/kubernetes/charts/capact/charts/engine/templates/deployment.yaml b/deploy/kubernetes/charts/capact/charts/engine/templates/deployment.yaml
@@ -48,6 +48,10 @@ spec:
  value: "{{ .Values.global.gateway.auth.username }}"
  - name: APP_GRAPHQLGATEWAY_PASSWORD
  value: "{{ .Values.global.gateway.auth.password }}"
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: "http://capact-hub-local.{{.Release.Namespace}}.svc.cluster.local/graphql"
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: "http://capact-hub-public.{{.Release.Namespace}}.svc.cluster.local/graphql"
  - name: APP_BUILTIN_RUNNER_IMAGE
  value: "{{ .Values.global.containerRegistry.path }}/{{ .Values.builtInRunner.image.name }}:{{ .Values.global.containerRegistry.overrideTag | default .Chart.AppVersion }}"
  - name: APP_BUILTIN_RUNNER_TIMEOUT

diff --git a/pkg/argo-actions/download_type_instances.go b/pkg/argo-actions/download_type_instances.go
@@ -4,7 +4,7 @@ import (
  "context"
  "fmt"
 
- "capact.io/capact/pkg/hub/client/local"
+ hubclient "capact.io/capact/pkg/hub/client"
  "capact.io/capact/pkg/runner"
  "github.com/pkg/errors"
  "go.uber.org/zap"
@@ -25,11 +25,11 @@ type DownloadConfig struct {
 type Download struct {
  log *zap.Logger
  cfg []DownloadConfig
- client *local.Client
+ client *hubclient.Client
 }
 
 // NewDownloadAction returns a new Download instance.
-func NewDownloadAction(log *zap.Logger, client *local.Client, cfg []DownloadConfig) Action {
+func NewDownloadAction(log *zap.Logger, client *hubclient.Client, cfg []DownloadConfig) Action {
  return &Download{
  log: log,
  cfg: cfg,

diff --git a/pkg/sdk/apis/0.0.1/types/types.extend.go b/pkg/sdk/apis/0.0.1/types/types.extend.go
@@ -1,6 +1,10 @@
 // Package types holds manually added types.
 package types
 
+import (
+ "fmt"
+)
+
 // OCFPathPrefix defines path prefix that all OCF manifest must have.
 const OCFPathPrefix = "cap."
 
@@ -20,6 +24,10 @@ type ManifestRef struct {
  Revision string `json:"revision"` // Version of the manifest content in the SemVer format.
 }
 
+func (in *ManifestRef) String() string {
+ return fmt.Sprintf("%s:%s", in.Path, in.Revision)
+}
+
 // ManifestRefWithOptRevision specifies type by path and optional revision.
 // +kubebuilder:object:generate=true
 type ManifestRefWithOptRevision struct {

diff --git a/pkg/sdk/renderer/argo/dedicated_renderer_test.go b/pkg/sdk/renderer/argo/dedicated_renderer_test.go
@@ -14,7 +14,7 @@ func createFakeDedicatedRendererObject(t *testing.T) *dedicatedRenderer {
  require.NoError(t, err)
 
  genUUID := func() string { return "uuid" }
- typeInstanceHandler := NewTypeInstanceHandler("alpine:3.7")
+ typeInstanceHandler := NewTypeInstanceHandler("alpine:3.7", "", "")
  typeInstanceHandler.SetGenUUID(genUUID)
 
  policyIOValidator := policyvalidation.NewValidator(fakeCli)

diff --git a/pkg/sdk/renderer/argo/renderer_test.go b/pkg/sdk/renderer/argo/renderer_test.go
@@ -36,7 +36,7 @@ func TestRenderHappyPath(t *testing.T) {
 
  policy := policy.NewAllowAll()
  genUUID := func() string { return "uuid" } // it has to be static because of parallel testing
- typeInstanceHandler := NewTypeInstanceHandler("alpine:3.7")
+ typeInstanceHandler := NewTypeInstanceHandler("alpine:3.7", "http://capact-hub-local.capact-system/graphql ", "http://capact-hub-public.capact-system/graphql")
  typeInstanceHandler.SetGenUUID(genUUID)
 
  ownerID := "default/action"
@@ -294,7 +294,7 @@ func TestRenderHappyPathWithCustomPolicies(t *testing.T) {
  tt := test
  t.Run(tt.name, func(t *testing.T) {
  genUUID := genUUIDFn(strconv.Itoa(tc))
- typeInstanceHandler := NewTypeInstanceHandler("alpine:3.7")
+ typeInstanceHandler := NewTypeInstanceHandler("alpine:3.7", "http://capact-hub-local.capact-system/graphql ", "http://capact-hub-public.capact-system/graphql")
  typeInstanceHandler.SetGenUUID(genUUID)
 
  interfaceIOValidator := actionvalidation.NewValidator(fakeCli)
@@ -341,7 +341,7 @@ func TestRendererMaxDepth(t *testing.T) {
  require.NoError(t, err)
 
  policy := policy.NewAllowAll()
- typeInstanceHandler := NewTypeInstanceHandler("alpine:3.7")
+ typeInstanceHandler := NewTypeInstanceHandler("alpine:3.7", "http://capact-hub-local.capact-system/graphql ", "http://capact-hub-public.capact-system/graphql")
  typeInstanceHandler.SetGenUUID(genUUIDFn(""))
 
  interfaceIOValidator := actionvalidation.NewValidator(fakeCli)
@@ -380,7 +380,7 @@ func TestRendererDenyAllPolicy(t *testing.T) {
  require.NoError(t, err)
 
  policy := policy.NewDenyAll()
- typeInstanceHandler := NewTypeInstanceHandler("alpine:3.7")
+ typeInstanceHandler := NewTypeInstanceHandler("alpine:3.7", "http://capact-hub-local.capact-system/graphql ", "http://capact-hub-public.capact-system/graphql")
  typeInstanceHandler.SetGenUUID(genUUIDFn(""))
 
  interfaceIOValidator := actionvalidation.NewValidator(fakeCli)

diff --git a/...enderer/argo/testdata/TestRenderHappyPath/Mattermost_workflow_with_user_input.golden.yaml b/...enderer/argo/testdata/TestRenderHappyPath/Mattermost_workflow_with_user_input.golden.yaml
@@ -1238,6 +1238,10 @@ args:
  value: /upload/payload
  - name: APP_UPLOAD_CONFIG_TYPE_INSTANCES_DIR
  value: /upload/typeInstances
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  imagePullPolicy: IfNotPresent
  name: ""

diff --git a/.../renderer/argo/testdata/TestRenderHappyPath/Nested_PostgreSQL_change_password.golden.yaml b/.../renderer/argo/testdata/TestRenderHappyPath/Nested_PostgreSQL_change_password.golden.yaml
@@ -290,6 +290,10 @@ args:
  value: DownloadAction
  - name: APP_DOWNLOAD_CONFIG
  value: '{6fc7dd6b-d150-4af3-a1aa-a868962b7d68,/firstRole.yaml},{f2421415-b8a4-464b-be12-b617794411c5,/postgresql.yaml}'
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  name: ""
  resources: {}
@@ -312,6 +316,10 @@ args:
  value: /update/payload
  - name: APP_UPDATE_CONFIG_TYPE_INSTANCES_DIR
  value: /update/typeInstances
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  imagePullPolicy: IfNotPresent
  name: ""

diff --git a/pkg/sdk/renderer/argo/testdata/TestRenderHappyPath/PostgreSQL_change_password.golden.yaml b/pkg/sdk/renderer/argo/testdata/TestRenderHappyPath/PostgreSQL_change_password.golden.yaml
@@ -271,6 +271,10 @@ args:
  value: DownloadAction
  - name: APP_DOWNLOAD_CONFIG
  value: '{6fc7dd6b-d150-4af3-a1aa-a868962b7d68,/role.yaml},{f2421415-b8a4-464b-be12-b617794411c5,/postgresql.yaml}'
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  name: ""
  resources: {}
@@ -293,6 +297,10 @@ args:
  value: /update/payload
  - name: APP_UPDATE_CONFIG_TYPE_INSTANCES_DIR
  value: /update/typeInstances
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  imagePullPolicy: IfNotPresent
  name: ""

diff --git a/...RenderHappyPath/PostgreSQL_workflow_with_user_input_and_without_TypeInstances.golden.yaml b/...RenderHappyPath/PostgreSQL_workflow_with_user_input_and_without_TypeInstances.golden.yaml
@@ -264,6 +264,10 @@ args:
  value: /upload/payload
  - name: APP_UPLOAD_CONFIG_TYPE_INSTANCES_DIR
  value: /upload/typeInstances
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  imagePullPolicy: IfNotPresent
  name: ""

diff --git a/...ata/TestRenderHappyPath/Workflow_with_apps_stack_installation_with_user_input.golden.yaml b/...ata/TestRenderHappyPath/Workflow_with_apps_stack_installation_with_user_input.golden.yaml
@@ -1216,6 +1216,10 @@ args:
  value: /upload/payload
  - name: APP_UPLOAD_CONFIG_TYPE_INSTANCES_DIR
  value: /upload/typeInstances
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  imagePullPolicy: IfNotPresent
  name: ""

diff --git a/...yPathWithCustomPolicies/CloudSQL_PostgreSQL_installation_with_GCP_SA_injected.golden.yaml b/...yPathWithCustomPolicies/CloudSQL_PostgreSQL_installation_with_GCP_SA_injected.golden.yaml
@@ -247,6 +247,10 @@ args:
  value: DownloadAction
  - name: APP_DOWNLOAD_CONFIG
  value: '{c268d3f5-8834-434b-bea2-b677793611c5,/gcp-sa.yaml}'
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  name: ""
  resources: {}
@@ -295,6 +299,10 @@ args:
  value: /upload/payload
  - name: APP_UPLOAD_CONFIG_TYPE_INSTANCES_DIR
  value: /upload/typeInstances
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  imagePullPolicy: IfNotPresent
  name: ""

diff --git a/...estdata/TestRenderHappyPathWithCustomPolicies/Mattermost_with_AWS_RDS_install.golden.yaml b/...estdata/TestRenderHappyPathWithCustomPolicies/Mattermost_with_AWS_RDS_install.golden.yaml
@@ -860,6 +860,10 @@ args:
  value: DownloadAction
  - name: APP_DOWNLOAD_CONFIG
  value: '{517cf827-233c-4bf1-8fc9-48534424dd58,/aws-credentials.yaml}'
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  name: ""
  resources: {}
@@ -1568,6 +1572,10 @@ args:
  value: /upload/payload
  - name: APP_UPLOAD_CONFIG_TYPE_INSTANCES_DIR
  value: /upload/typeInstances
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  imagePullPolicy: IfNotPresent
  name: ""

diff --git a/...olicies/Mattermost_with_CloudSQL_PostgreSQL_installation_with_GCP_SA_injected.golden.yaml b/...olicies/Mattermost_with_CloudSQL_PostgreSQL_installation_with_GCP_SA_injected.golden.yaml
@@ -583,6 +583,10 @@ args:
  value: DownloadAction
  - name: APP_DOWNLOAD_CONFIG
  value: '{c268d3f5-8834-434b-bea2-b677793611c5,/gcp-sa.yaml}'
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  name: ""
  resources: {}
@@ -1269,6 +1273,10 @@ args:
  value: /upload/payload
  - name: APP_UPLOAD_CONFIG_TYPE_INSTANCES_DIR
  value: /upload/typeInstances
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  imagePullPolicy: IfNotPresent
  name: ""

diff --git a/...estRenderHappyPathWithCustomPolicies/Mattermost_with_CloudSQL_using_Terraform.golden.yaml b/...estRenderHappyPathWithCustomPolicies/Mattermost_with_CloudSQL_using_Terraform.golden.yaml
@@ -644,6 +644,10 @@ args:
  value: DownloadAction
  - name: APP_DOWNLOAD_CONFIG
  value: '{c268d3f5-8834-434b-bea2-b677793611c5,/gcp-sa.yaml}'
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  name: ""
  resources: {}
@@ -1341,6 +1345,10 @@ args:
  value: /upload/payload
  - name: APP_UPLOAD_CONFIG_TYPE_INSTANCES_DIR
  value: /upload/typeInstances
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  imagePullPolicy: IfNotPresent
  name: ""

diff --git a/...estRenderHappyPathWithCustomPolicies/Mattermost_with_existing_DB_installation.golden.yaml b/...estRenderHappyPathWithCustomPolicies/Mattermost_with_existing_DB_installation.golden.yaml
@@ -1059,6 +1059,10 @@ args:
  value: DownloadAction
  - name: APP_DOWNLOAD_CONFIG
  value: '{f2421415-b8a4-464b-be12-b617794411c5,/postgresql.yaml}'
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  name: ""
  resources: {}
@@ -1105,6 +1109,10 @@ args:
  value: DownloadAction
  - name: APP_DOWNLOAD_CONFIG
  value: '{f2421415-b8a4-464b-be12-b617794411c5,/postgresql.yaml}'
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  name: ""
  resources: {}
@@ -1124,6 +1132,10 @@ args:
  value: /upload/payload
  - name: APP_UPLOAD_CONFIG_TYPE_INSTANCES_DIR
  value: /upload/typeInstances
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  imagePullPolicy: IfNotPresent
  name: ""

diff --git a/...ustomPolicies/RDS_installation_with_AWS_SA_and_additional_parameters_injected.golden.yaml b/...ustomPolicies/RDS_installation_with_AWS_SA_and_additional_parameters_injected.golden.yaml
@@ -550,6 +550,10 @@ args:
  value: DownloadAction
  - name: APP_DOWNLOAD_CONFIG
  value: '{517cf827-233c-4bf1-8fc9-48534424dd58,/aws-credentials.yaml}'
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  name: ""
  resources: {}
@@ -598,6 +602,10 @@ args:
  value: /upload/payload
  - name: APP_UPLOAD_CONFIG_TYPE_INSTANCES_DIR
  value: /upload/typeInstances
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  imagePullPolicy: IfNotPresent
  name: ""

diff --git a/...hCustomPolicies/Unmet_policy_constraints_-_fallback_to_Bitnami_Implementation.golden.yaml b/...hCustomPolicies/Unmet_policy_constraints_-_fallback_to_Bitnami_Implementation.golden.yaml
@@ -264,6 +264,10 @@ args:
  value: /upload/payload
  - name: APP_UPLOAD_CONFIG_TYPE_INSTANCES_DIR
  value: /upload/typeInstances
+ - name: APP_LOCAL_HUB_ENDPOINT
+ value: 'http://capact-hub-local.capact-system/graphql '
+ - name: APP_PUBLIC_HUB_ENDPOINT
+ value: http://capact-hub-public.capact-system/graphql
  image: alpine:3.7
  imagePullPolicy: IfNotPresent
  name: ""