Correction after review

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 |
 

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))

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)

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

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,

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 {

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)

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", "", "")
  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", "", "")
  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", "", "")
  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", "", "")
  typeInstanceHandler.SetGenUUID(genUUIDFn(""))
 
  interfaceIOValidator := actionvalidation.NewValidator(fakeCli)

pkg/sdk/renderer/argo/typeinstance_handler.go

@@ -17,14 +17,18 @@ import (
 // TypeInstanceHandler provides functionality to handle TypeInstance operations such as
 // injecting download step and upload step.
 type TypeInstanceHandler struct {
- hubActionsImage string
- genUUID func() string
+ hubActionsImage string
+ localHubEndpoint string
+ publicHubEndpoint string
+ genUUID func() string
 }
 
 // NewTypeInstanceHandler returns a new TypeInstanceHandler instance.
-func NewTypeInstanceHandler(hubActionsImage string) *TypeInstanceHandler {
+func NewTypeInstanceHandler(hubActionsImage string, localHubEndpoint string, publicHubEndpoint string) *TypeInstanceHandler {
  return &TypeInstanceHandler{
- hubActionsImage: hubActionsImage,
+ hubActionsImage: hubActionsImage,
+ localHubEndpoint: localHubEndpoint,
+ publicHubEndpoint: publicHubEndpoint,
  genUUID: func() string {
  return uuid.New().String()
  },
@@ -70,6 +74,14 @@ func (r *TypeInstanceHandler) AddInputTypeInstances(rootWorkflow *Workflow, inst
  Name: "APP_DOWNLOAD_CONFIG",
  Value: strings.Join(typeInstanceToDownload, ","),
  },
+ {
+ Name: "APP_LOCAL_HUB_ENDPOINT",
+ Value: r.localHubEndpoint,
+ },
+ {
+ Name: "APP_PUBLIC_HUB_ENDPOINT",
+ Value: r.publicHubEndpoint,
+ },
  },
  },
  Outputs: wfv1.Outputs{
@@ -197,6 +209,14 @@ func (r *TypeInstanceHandler) AddUploadTypeInstancesStep(rootWorkflow *Workflow,
  Name: "APP_UPLOAD_CONFIG_TYPE_INSTANCES_DIR",
  Value: "/upload/typeInstances",
  },
+ {
+ Name: "APP_LOCAL_HUB_ENDPOINT",
+ Value: r.localHubEndpoint,
+ },
+ {
+ Name: "APP_PUBLIC_HUB_ENDPOINT",
+ Value: r.publicHubEndpoint,
+ },
  },
  },
  Inputs: wfv1.Inputs{
@@ -288,6 +308,14 @@ func (r *TypeInstanceHandler) AddUpdateTypeInstancesStep(rootWorkflow *Workflow,
  Name: "APP_UPDATE_CONFIG_TYPE_INSTANCES_DIR",
  Value: "/update/typeInstances",
  },
+ {
+ Name: "APP_LOCAL_HUB_ENDPOINT",
+ Value: r.localHubEndpoint,
+ },
+ {
+ Name: "APP_PUBLIC_HUB_ENDPOINT",
+ Value: r.publicHubEndpoint,
+ },
  },
  },
  Inputs: wfv1.Inputs{