feat: #51 drop secrets vars configs support

internal/app/ptah-agent/service.go

@@ -2,7 +2,6 @@ package ptah_agent
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 
@@ -55,27 +54,9 @@ func (e *taskExecutor) updateDockerService(ctx context.Context, req *t.UpdateSer
 func (e *taskExecutor) prepareServicePayload(ctx context.Context, servicePayload t.ServicePayload, secretVars t.SecretVars) (*swarm.ServiceSpec, error) {
 	spec := servicePayload.SwarmServiceSpec
 
-	if secretVars.ConfigName != "" {
-		newVarsJson, err := json.Marshal(secretVars.Values)
-		if err != nil {
-			return nil, errors.Wrapf(err, "marshal vars")
-		}
-
-		_, err = e.docker.ConfigCreate(ctx, swarm.ConfigSpec{
-			Annotations: swarm.Annotations{
-				Name:   secretVars.ConfigName,
-				Labels: secretVars.ConfigLabels,
-			},
-			Data: newVarsJson,
-		})
-
-		if err != nil {
-			return nil, errors.Wrapf(err, "create config %s", secretVars.ConfigName)
-		}
-
-		for key, value := range secretVars.Values {
-			spec.TaskTemplate.ContainerSpec.Env = append(spec.TaskTemplate.ContainerSpec.Env, fmt.Sprintf("%s=%s", key, value))
-		}
+	for key, value := range secretVars.Values {
+		// We will be decoding the secret values here
+		spec.TaskTemplate.ContainerSpec.Env = append(spec.TaskTemplate.ContainerSpec.Env, fmt.Sprintf("%s=%s", key, value))
 	}
 
 	for _, config := range spec.TaskTemplate.ContainerSpec.Configs {

internal/pkg/ptah-client/task_types.go

@@ -58,6 +58,7 @@ type CreateSecretRes struct {
 
 type ServicePayload struct {
 	AuthConfigName string
+	SecretVars     SecretVars
 	ReleaseCommand struct {
 		ConfigName   string
 		ConfigLabels map[string]string
@@ -74,8 +75,6 @@ type SecretVars struct {
 
 type CreateServiceReq struct {
 	ServicePayload
-
-	SecretVars SecretVars
 }
 
 type CreateServiceRes struct {
@@ -84,8 +83,6 @@ type CreateServiceRes struct {
 
 type UpdateServiceReq struct {
 	ServicePayload
-
-	SecretVars SecretVars
 }
 
 type UpdateServiceRes struct {