test(e2e): update init test's flags to accomodate for jobs (#1564)

_By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice._

Author: efekarakus

e2e/init/init_test.go

@@ -23,13 +23,13 @@ var _ = Describe("init flow", func() {
 	BeforeAll(func() {
 		svcName = "front-end"
 		_, initErr = cli.Init(&client.InitRequest{
-			AppName:    appName,
-			SvcName:    svcName,
-			ImageTag:   "gallopinggurdey",
-			Dockerfile: "./front-end/Dockerfile",
-			SvcType:    "Load Balanced Web Service",
-			Deploy:     true,
-			SvcPort:    "80",
+			AppName:      appName,
+			WorkloadName: svcName,
+			ImageTag:     "gallopinggurdey",
+			Dockerfile:   "./front-end/Dockerfile",
+			WorkloadType: "Load Balanced Web Service",
+			Deploy:       true,
+			SvcPort:      "80",
 		})
 	})
 

e2e/internal/client/cli.go

@@ -28,13 +28,13 @@ type AppInitRequest struct {
 
 // InitRequest contains the parameters for calling copilot init.
 type InitRequest struct {
-	AppName    string
-	SvcName    string
-	Deploy     bool
-	ImageTag   string
-	Dockerfile string
-	SvcType    string
-	SvcPort    string
+	AppName      string
+	WorkloadName string
+	Deploy       bool
+	ImageTag     string
+	Dockerfile   string
+	WorkloadType string
+	SvcPort      string
 }
 
 // EnvInitRequest contains the parameters for calling copilot env init.
@@ -181,8 +181,8 @@ func (cli *CLI) Init(opts *InitRequest) (string, error) {
 	return cli.exec(
 		exec.Command(cli.path, "init",
 			"--app", opts.AppName,
-			"--svc", opts.SvcName,
-			"--svc-type", opts.SvcType,
+			"--name", opts.WorkloadName,
+			"--type", opts.WorkloadType,
 			"--tag", opts.ImageTag,
 			"--dockerfile", opts.Dockerfile,
 			"--port", opts.SvcPort,

internal/pkg/cli/flag.go

@@ -92,12 +92,11 @@ const (
 // Short flag names.
 // A short flag only exists if the flag or flag set is mandatory by the command.
 const (
-	nameFlagShort    = "n"
-	appFlagShort     = "a"
-	envFlagShort     = "e"
-	svcFlagShort     = "s"
-	svcTypeFlagShort = "t"
-	jobTypeFlagShort = "t"
+	nameFlagShort = "n"
+	appFlagShort  = "a"
+	envFlagShort  = "e"
+	svcFlagShort  = "s"
+	typeFlagShort = "t"
 
 	dockerFileFlagShort        = "d"
 	imageFlagShort             = "i"
@@ -141,6 +140,7 @@ const (
 	envFlagDescription      = "Name of the environment."
 	svcFlagDescription      = "Name of the service."
 	jobFlagDescription      = "Name of the job."
+	workloadFlagDescription = "Name of the service or job."
 	pipelineFlagDescription = "Name of the pipeline."
 	profileFlagDescription  = "Name of the profile."
 	yesFlagDescription      = "Skips confirmation prompt."
@@ -163,7 +163,7 @@ Defaults to all logs. Only one of start-time / since may be used.`
 Defaults to all logs. Only one of end-time / follow may be used.`
 	tasksLogsFlagDescription = "Optional. Only return logs from specific task IDs."
 
-	deployTestFlagDescription        = `Deploy your service to a "test" environment.`
+	deployTestFlagDescription        = `Deploy your service or job to a "test" environment.`
 	githubURLFlagDescription         = "GitHub repository URL for your service."
 	githubAccessTokenFlagDescription = "GitHub personal access token for your repository."
 	gitBranchFlagDescription         = "Branch used to trigger your pipeline."

internal/pkg/cli/init.go

@@ -433,8 +433,8 @@ func BuildInitCmd() *cobra.Command {
 		}),
 	}
 	cmd.Flags().StringVarP(&vars.appName, appFlag, appFlagShort, tryReadingAppName(), appFlagDescription)
-	cmd.Flags().StringVarP(&vars.svcName, nameFlag, svcFlagShort, "", svcFlagDescription)
-	cmd.Flags().StringVarP(&vars.wkldType, typeFlag, svcTypeFlagShort, "", wkldTypeFlagDescription)
+	cmd.Flags().StringVarP(&vars.svcName, nameFlag, nameFlagShort, "", workloadFlagDescription)
+	cmd.Flags().StringVarP(&vars.wkldType, typeFlag, typeFlagShort, "", wkldTypeFlagDescription)
 	cmd.Flags().StringVarP(&vars.dockerfilePath, dockerFileFlag, dockerFileFlagShort, "", dockerFileFlagDescription)
 	cmd.Flags().StringVarP(&vars.image, imageFlag, imageFlagShort, "", imageFlagDescription)
 	cmd.Flags().BoolVar(&vars.shouldDeploy, deployFlag, false, deployTestFlagDescription)

internal/pkg/cli/job_init.go

@@ -305,7 +305,7 @@ func buildJobInitCmd() *cobra.Command {
 	}
 	cmd.Flags().StringVarP(&vars.appName, appFlag, appFlagShort, tryReadingAppName(), appFlagDescription)
 	cmd.Flags().StringVarP(&vars.name, nameFlag, nameFlagShort, "", jobFlagDescription)
-	cmd.Flags().StringVarP(&vars.wkldType, jobTypeFlag, jobTypeFlagShort, "", jobTypeFlagDescription)
+	cmd.Flags().StringVarP(&vars.wkldType, jobTypeFlag, typeFlagShort, "", jobTypeFlagDescription)
 	cmd.Flags().StringVarP(&vars.dockerfilePath, dockerFileFlag, dockerFileFlagShort, "", dockerFileFlagDescription)
 	cmd.Flags().StringVarP(&vars.schedule, scheduleFlag, scheduleFlagShort, "", scheduleFlagDescription)
 	cmd.Flags().StringVar(&vars.timeout, timeoutFlag, "", timeoutFlagDescription)

internal/pkg/cli/storage_init.go

@@ -579,7 +579,7 @@ environment variables for easy access.`,
 		}),
 	}
 	cmd.Flags().StringVarP(&vars.storageName, nameFlag, nameFlagShort, "", storageFlagDescription)
-	cmd.Flags().StringVarP(&vars.storageType, storageTypeFlag, svcTypeFlagShort, "", storageTypeFlagDescription)
+	cmd.Flags().StringVarP(&vars.storageType, storageTypeFlag, typeFlagShort, "", storageTypeFlagDescription)
 	cmd.Flags().StringVarP(&vars.storageSvc, svcFlag, svcFlagShort, "", storageServiceFlagDescription)
 
 	cmd.Flags().StringVar(&vars.partitionKey, storagePartitionKeyFlag, "", storagePartitionKeyFlagDescription)

internal/pkg/cli/svc_init.go

@@ -411,7 +411,7 @@ This command is also run as part of "copilot init".`,
 	}
 	cmd.Flags().StringVarP(&vars.appName, appFlag, appFlagShort, tryReadingAppName(), appFlagDescription)
 	cmd.Flags().StringVarP(&vars.name, nameFlag, nameFlagShort, "", svcFlagDescription)
-	cmd.Flags().StringVarP(&vars.wkldType, svcTypeFlag, svcTypeFlagShort, "", svcTypeFlagDescription)
+	cmd.Flags().StringVarP(&vars.wkldType, svcTypeFlag, typeFlagShort, "", svcTypeFlagDescription)
 	cmd.Flags().StringVarP(&vars.dockerfilePath, dockerFileFlag, dockerFileFlagShort, "", dockerFileFlagDescription)
 	cmd.Flags().StringVarP(&vars.image, imageFlag, imageFlagShort, "", imageFlagDescription)