Rename internals

apppackio · Jan 10, 2021 · bccc567 · bccc567
1 parent 739d502
commit bccc567
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 46 deletions.
diff --git a/.github/workflows/functional_tests.yml b/.github/workflows/functional_tests.yml
@@ -37,7 +37,7 @@ jobs:
           export ACCOUNT_ID=$(echo $ROLE_ARN | cut -d: -f5)
           export EXTERNAL_ID=$(grep ExternalId account_create_output.txt | awk '{print $2}')
           python -c "import json; print(json.dumps({\"primary_id\": {\"S\": \"ACCT#$ACCOUNT_ID\"}, \"secondary_id\": {\"S\": \"-\"}, \"external_id\": {\"S\": \"$EXTERNAL_ID\"}, \"region\": {\"S\": \"us-east-1\"}, \"role_arn\": {\"S\": \"$ROLE_ARN\"}}))" > item.json
-          aws dynamodb put-item --table-name paaws --item file://item.json
+          aws dynamodb put-item --table-name apppack --item file://item.json
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.APPPACK_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.APPPACK_AWS_SECRET_ACCESS_KEY }}
@@ -105,7 +105,7 @@ jobs:
         if: always()
         run: |
           cat item.json
-          aws dynamodb delete-item --table-name paaws --key '{
+          aws dynamodb delete-item --table-name apppack --key '{
             "primary_id": {"S": "ACCT#'$(grep AppPackRoleArn account_create_output.txt | awk '{print $2}' | cut -d: -f5)'"},
             "secondary_id": {"S": "-"}
           }'

diff --git a/app/app.go b/app/app.go
@@ -131,7 +131,7 @@ type ECSConfig struct {
 func ddbItem(sess *session.Session, primaryID string, secondaryID string) (*map[string]*dynamodb.AttributeValue, error) {
 	ddbSvc := dynamodb.New(sess)
 	result, err := ddbSvc.GetItem(&dynamodb.GetItemInput{
-		TableName: aws.String("paaws"),
+		TableName: aws.String("apppack"),
 		Key: map[string]*dynamodb.AttributeValue{
 			"primary_id": {
 				S: aws.String(primaryID),
@@ -498,7 +498,7 @@ type Scaling struct {
 
 func (a *App) ResizeProcess(processType string, cpu int, memory int) error {
 	ssmSvc := ssm.New(a.Session)
-	parameterName := fmt.Sprintf("/paaws/apps/%s/scaling", a.Name)
+	parameterName := fmt.Sprintf("/apppack/apps/%s/scaling", a.Name)
 	parameterOutput, err := ssmSvc.GetParameter(&ssm.GetParameterInput{
 		Name: &parameterName,
 	})
@@ -539,7 +539,7 @@ func (a *App) ResizeProcess(processType string, cpu int, memory int) error {
 
 func (a *App) ScaleProcess(processType string, minProcessCount int, maxProcessCount int) error {
 	ssmSvc := ssm.New(a.Session)
-	parameterName := fmt.Sprintf("/paaws/apps/%s/scaling", a.Name)
+	parameterName := fmt.Sprintf("/apppack/apps/%s/scaling", a.Name)
 	parameterOutput, err := ssmSvc.GetParameter(&ssm.GetParameterInput{
 		Name: &parameterName,
 	})
@@ -586,7 +586,7 @@ type ScheduledTask struct {
 // ScheduledTasks lists scheduled tasks for the app
 func (a *App) ScheduledTasks() ([]*ScheduledTask, error) {
 	ssmSvc := ssm.New(a.Session)
-	parameterName := fmt.Sprintf("/paaws/apps/%s/scheduled-tasks", a.Name)
+	parameterName := fmt.Sprintf("/apppack/apps/%s/scheduled-tasks", a.Name)
 	parameterOutput, err := ssmSvc.GetParameter(&ssm.GetParameterInput{
 		Name: &parameterName,
 	})
@@ -619,7 +619,7 @@ func (a *App) CreateScheduledTask(schedule string, command string) ([]*Scheduled
 	if err != nil {
 		return nil, err
 	}
-	parameterName := fmt.Sprintf("/paaws/apps/%s/scheduled-tasks", a.Name)
+	parameterName := fmt.Sprintf("/apppack/apps/%s/scheduled-tasks", a.Name)
 	_, err = ssmSvc.PutParameter(&ssm.PutParameterInput{
 		Name:      &parameterName,
 		Value:     aws.String(fmt.Sprintf("%s", tasksBytes)),
@@ -645,7 +645,7 @@ func (a *App) DeleteScheduledTask(idx int) (*ScheduledTask, error) {
 	if err != nil {
 		return nil, err
 	}
-	parameterName := fmt.Sprintf("/paaws/apps/%s/scheduled-tasks", a.Name)
+	parameterName := fmt.Sprintf("/apppack/apps/%s/scheduled-tasks", a.Name)
 	_, err = ssmSvc.PutParameter(&ssm.PutParameterInput{
 		Name:      &parameterName,
 		Value:     aws.String(fmt.Sprintf("%s", tasksBytes)),

diff --git a/cmd/config.go b/cmd/config.go
@@ -50,7 +50,7 @@ var getCmd = &cobra.Command{
 		checkErr(err)
 		svc := ssm.New(a.Session)
 		resp, err := svc.GetParameter(&ssm.GetParameterInput{
-			Name:           aws.String(fmt.Sprintf("/paaws/apps/%s/config/%s", AppName, args[0])),
+			Name:           aws.String(fmt.Sprintf("/apppack/apps/%s/config/%s", AppName, args[0])),
 			WithDecryption: aws.Bool(true),
 		})
 		Spinner.Stop()
@@ -78,7 +78,7 @@ var setCmd = &cobra.Command{
 		checkErr(err)
 		svc := ssm.New(a.Session)
 		_, err = svc.PutParameter(&ssm.PutParameterInput{
-			Name:      aws.String(fmt.Sprintf("/paaws/apps/%s/config/%s", AppName, name)),
+			Name:      aws.String(fmt.Sprintf("/apppack/apps/%s/config/%s", AppName, name)),
 			Type:      aws.String("SecureString"),
 			Overwrite: aws.Bool(true),
 			Value:     &value,
@@ -102,7 +102,7 @@ var unsetCmd = &cobra.Command{
 		checkErr(err)
 		svc := ssm.New(a.Session)
 		_, err = svc.DeleteParameter(&ssm.DeleteParameterInput{
-			Name: aws.String(fmt.Sprintf("/paaws/apps/%s/config/%s", AppName, args[0])),
+			Name: aws.String(fmt.Sprintf("/apppack/apps/%s/config/%s", AppName, args[0])),
 		})
 		Spinner.Stop()
 		checkErr(err)
@@ -126,7 +126,7 @@ var listCmd = &cobra.Command{
 		checkErr(err)
 		svc := ssm.New(a.Session)
 		resp, err := svc.GetParametersByPath(&ssm.GetParametersByPathInput{
-			Path:           aws.String(fmt.Sprintf("/paaws/apps/%s/config/", AppName)),
+			Path:           aws.String(fmt.Sprintf("/apppack/apps/%s/config/", AppName)),
 			WithDecryption: aws.Bool(true),
 		})
 		Spinner.Stop()

diff --git a/cmd/create.go b/cmd/create.go
@@ -42,13 +42,13 @@ import (
 )
 
 const (
-	appFormationURL             = "https://s3.amazonaws.com/paaws-cloudformations/latest/app.json"
-	clusterFormationURL         = "https://s3.amazonaws.com/paaws-cloudformations/latest/cluster.json"
-	accountFormationURL         = "https://s3.amazonaws.com/paaws-cloudformations/latest/account.json"
-	databaseFormationURL        = "https://s3.amazonaws.com/paaws-cloudformations/latest/database.json"
-	redisFormationURL           = "https://s3.amazonaws.com/paaws-cloudformations/latest/redis.json"
+	appFormationURL             = "https://s3.amazonaws.com/apppack-cloudformations/latest/app.json"
+	clusterFormationURL         = "https://s3.amazonaws.com/apppack-cloudformations/latest/cluster.json"
+	accountFormationURL         = "https://s3.amazonaws.com/apppack-cloudformations/latest/account.json"
+	databaseFormationURL        = "https://s3.amazonaws.com/apppack-cloudformations/latest/database.json"
+	redisFormationURL           = "https://s3.amazonaws.com/apppack-cloudformations/latest/redis.json"
 	redisStackNameTmpl          = "apppack-redis-%s"
-	redisAuthTokenParameterTmpl = "/paaws/redis/%s/auth-token"
+	redisAuthTokenParameterTmpl = "/apppack/redis/%s/auth-token"
 	databaseStackNameTmpl       = "apppack-database-%s"
 )
 
@@ -121,7 +121,7 @@ type Stack struct {
 func listClusters(sess *session.Session) ([]string, error) {
 	ddbSvc := dynamodb.New(sess)
 	result, err := ddbSvc.Query(&dynamodb.QueryInput{
-		TableName:              aws.String("paaws"),
+		TableName:              aws.String("apppack"),
 		KeyConditionExpression: aws.String("primary_id = :id1 AND begins_with(secondary_id,:id2)"),
 		ExpressionAttributeValues: map[string]*dynamodb.AttributeValue{
 			":id1": {S: aws.String("CLUSTERS")},
@@ -175,7 +175,7 @@ func getDDBClusterItem(sess *session.Session, cluster *string, addon string, nam
 	ddbSvc := dynamodb.New(sess)
 	secondaryID := fmt.Sprintf("%s#%s#%s", *cluster, addon, *name)
 	result, err := ddbSvc.GetItem(&dynamodb.GetItemInput{
-		TableName: aws.String("paaws"),
+		TableName: aws.String("apppack"),
 		Key: map[string]*dynamodb.AttributeValue{
 			"primary_id": {
 				S: aws.String("CLUSTERS"),
@@ -202,7 +202,7 @@ func getDDBClusterItem(sess *session.Session, cluster *string, addon string, nam
 func ddbClusterQuery(sess *session.Session, cluster *string, addon *string) (*[]map[string]*dynamodb.AttributeValue, error) {
 	ddbSvc := dynamodb.New(sess)
 	result, err := ddbSvc.Query(&dynamodb.QueryInput{
-		TableName:              aws.String("paaws"),
+		TableName:              aws.String("apppack"),
 		KeyConditionExpression: aws.String("primary_id = :id1 AND begins_with(secondary_id,:id2)"),
 		ExpressionAttributeValues: map[string]*dynamodb.AttributeValue{
 			":id1": {S: aws.String("CLUSTERS")},
@@ -353,7 +353,7 @@ func askForMissingArgs(cmd *cobra.Command, overrideQuestions *map[string]*survey
 func stackFromDDBItem(sess *session.Session, secondaryID string) (*cloudformation.Stack, error) {
 	ddbSvc := dynamodb.New(sess)
 	result, err := ddbSvc.GetItem(&dynamodb.GetItemInput{
-		TableName: aws.String("paaws"),
+		TableName: aws.String("apppack"),
 		Key: map[string]*dynamodb.AttributeValue{
 			"primary_id": {
 				S: aws.String("CLUSTERS"),
@@ -440,7 +440,7 @@ var accountCmd = &cobra.Command{
 		sess := session.Must(session.NewSession())
 		ssmSvc := ssm.New(sess)
 		_, err = ssmSvc.GetParameter(&ssm.GetParameterInput{
-			Name: aws.String("/paaws/account"),
+			Name: aws.String("/apppack/account"),
 		})
 
 		if err == nil {
@@ -453,27 +453,27 @@ var accountCmd = &cobra.Command{
 		}
 		startSpinner()
 		tags := []*ssm.Tag{
-			{Key: aws.String("paaws:account"), Value: aws.String("true")},
-			{Key: aws.String("paaws"), Value: aws.String("true")},
+			{Key: aws.String("apppack:account"), Value: aws.String("true")},
+			{Key: aws.String("apppack"), Value: aws.String("true")},
 		}
 		_, err = ssmSvc.PutParameter(&ssm.PutParameterInput{
-			Name:  aws.String("/paaws/account/dockerhub-access-token"),
+			Name:  aws.String("/apppack/account/dockerhub-access-token"),
 			Value: getArgValue(cmd, answers, "dockerhub-access-token", true),
 			Type:  aws.String("SecureString"),
 			Tags:  tags,
 		})
 		checkErr(err)
 		cfnTags := []*cloudformation.Tag{
-			{Key: aws.String("paaws:account"), Value: aws.String("true")},
-			{Key: aws.String("paaws"), Value: aws.String("true")},
+			{Key: aws.String("apppack:account"), Value: aws.String("true")},
+			{Key: aws.String("apppack"), Value: aws.String("true")},
 		}
 
 		input := cloudformation.CreateStackInput{
-			StackName:   aws.String("paaws-account"),
+			StackName:   aws.String("apppack-account"),
 			TemplateURL: aws.String(accountFormationURL),
 			Parameters: []*cloudformation.Parameter{
 				{
-					ParameterKey:   aws.String("PaawsRoleExternalId"),
+					ParameterKey:   aws.String("AppPackRoleExternalId"),
 					ParameterValue: aws.String(strings.Replace(uuid.New().String(), "-", "", -1)),
 				},
 				{
@@ -545,8 +545,8 @@ var createClusterCmd = &cobra.Command{
 		}
 		startSpinner()
 		cfnTags := []*cloudformation.Tag{
-			{Key: aws.String("paaws:cluster"), Value: &clusterName},
-			{Key: aws.String("paaws"), Value: aws.String("true")},
+			{Key: aws.String("apppack:cluster"), Value: &clusterName},
+			{Key: aws.String("apppack"), Value: aws.String("true")},
 		}
 
 		input := cloudformation.CreateStackInput{
@@ -651,9 +651,9 @@ var createDatabaseCmd = &cobra.Command{
 		}
 		startSpinner()
 		cfnTags := []*cloudformation.Tag{
-			{Key: aws.String("paaws:database"), Value: &name},
-			{Key: aws.String("paaws:cluster"), Value: cluster},
-			{Key: aws.String("paaws"), Value: aws.String("true")},
+			{Key: aws.String("apppack:database"), Value: &name},
+			{Key: aws.String("apppack:cluster"), Value: cluster},
+			{Key: aws.String("apppack"), Value: aws.String("true")},
 		}
 
 		input := cloudformation.CreateStackInput{
@@ -767,9 +767,9 @@ var createRedisCmd = &cobra.Command{
 		})
 		checkErr(err)
 		cfnTags := []*cloudformation.Tag{
-			{Key: aws.String("paaws:redis"), Value: &name},
-			{Key: aws.String("paaws:cluster"), Value: cluster},
-			{Key: aws.String("paaws"), Value: aws.String("true")},
+			{Key: aws.String("apppack:redis"), Value: &name},
+			{Key: aws.String("apppack:cluster"), Value: cluster},
+			{Key: aws.String("apppack"), Value: aws.String("true")},
 		}
 
 		input := cloudformation.CreateStackInput{
@@ -940,9 +940,9 @@ var appCmd = &cobra.Command{
 		name := getArgValue(cmd, &answers, "name", true)
 		cluster := getArgValue(cmd, &answers, "cluster", true)
 		cfnTags := []*cloudformation.Tag{
-			{Key: aws.String("paaws:appName"), Value: name},
-			{Key: aws.String("paaws:cluster"), Value: cluster},
-			{Key: aws.String("paaws"), Value: aws.String("true")},
+			{Key: aws.String("apppack:appName"), Value: name},
+			{Key: aws.String("apppack:cluster"), Value: cluster},
+			{Key: aws.String("apppack"), Value: aws.String("true")},
 		}
 
 		clusterStack, err := stackFromDDBItem(sess, fmt.Sprintf("CLUSTER#%s", *cluster))
@@ -1010,7 +1010,7 @@ var appCmd = &cobra.Command{
 					ParameterValue: clusterStack.StackName,
 				},
 				{
-					ParameterKey:   aws.String("PaawsRoleExternalId"),
+					ParameterKey:   aws.String("AppPackRoleExternalId"),
 					ParameterValue: aws.String(strings.Replace(uuid.New().String(), "-", "", -1)),
 				},
 				{

diff --git a/cmd/destroy.go b/cmd/destroy.go
@@ -68,7 +68,7 @@ var destroyAccountCmd = &cobra.Command{
 		sess := session.Must(session.NewSession())
 		ssmSvc := ssm.New(sess)
 		paramOutput, err := ssmSvc.GetParameter(&ssm.GetParameterInput{
-			Name: aws.String("/paaws/account"),
+			Name: aws.String("/apppack/account"),
 		})
 		checkErr(err)
 		var account accountDetails
@@ -95,7 +95,7 @@ var destroyAccountCmd = &cobra.Command{
 			StackName: &account.StackID,
 		})
 		_, err1 := ssmSvc.DeleteParameter(&ssm.DeleteParameterInput{
-			Name: aws.String("/paaws/account/dockerhub-access-token"),
+			Name: aws.String("/apppack/account/dockerhub-access-token"),
 		})
 		Spinner.Stop()
 		checkErr(err)

diff --git a/cmd/ps.go b/cmd/ps.go
@@ -52,7 +52,7 @@ var psCmd = &cobra.Command{
 		// group tasks by process type
 		grouped := map[string][]*ecs.Task{}
 		for _, t := range tasks {
-			tag, err := getTag(t.Tags, "paaws:processType")
+			tag, err := getTag(t.Tags, "apppack:processType")
 			if err != nil {
 				continue
 			}
@@ -87,7 +87,7 @@ var psCmd = &cobra.Command{
 				cpu, err := strconv.ParseFloat(*t.Cpu, 32)
 				checkErr(err)
 				cpu = cpu / 1024.0
-				buildNumber, err := getTag(t.Tags, "paaws:buildNumber")
+				buildNumber, err := getTag(t.Tags, "apppack:buildNumber")
 				checkErr(err)
 				fmt.Printf("%s: %s (%s) %s %s\n", name, strings.ToLower(*t.LastStatus), aurora.Bold(aurora.Cyan(fmt.Sprintf("%.2fcpu/%smem", cpu, *t.Memory))), aurora.Yellow(fmt.Sprintf("build #%s", *buildNumber)), aurora.Faint(fmt.Sprintf("%s (~ %s)", t.StartedAt.Local().Format("Jan 02, 2006 15:04:05 MST"), humanize.Time(*t.StartedAt))))
 				indent := strings.Repeat(" ", len(name)+2)