Simplify aws policy by adding cortex prefix to queue name (#1941)

Author: vishalbollu

cli/cmd/cluster.go

@@ -188,7 +188,6 @@ var _clusterUpCmd = &cobra.Command{
 			LogGroup:    clusterConfig.ClusterName,
 			Bucket:      clusterConfig.Bucket,
 			Region:      clusterConfig.Region,
-			SQSPrefix:   clusterconfig.SQSNamePrefix(clusterConfig.ClusterName),
 			AccountID:   accountID,
 		})
 		if err != nil {

docs/clusters/aws/auth.md

@@ -77,7 +77,7 @@ _NOTE: The policy created during `cortex cluster up` will automatically be delet
 		{
 			"Effect": "Allow",
 			"Action": "sqs:*",
-			"Resource": "arn:aws:sqs:{{ .Region }}:{{ .AccountID }}:{{ .SQSPrefix }}*"
+			"Resource": "arn:aws:sqs:{{ .Region }}:{{ .AccountID }}:cortex-*"
 		},
 		{
 			"Effect": "Allow",

pkg/operator/resources/job/batchapi/queue.go

@@ -35,7 +35,7 @@ func apiQueueNamePrefix(apiName string) string {
 	return config.CoreConfig.SQSNamePrefix() + apiName + "-"
 }
 
-// QueueName is <hash of cluster name>-<api_name>-<job_id>.fifo
+// QueueName is cortex-<hash of cluster name>-<api_name>-<job_id>.fifo
 func getJobQueueName(jobKey spec.JobKey) string {
 	return apiQueueNamePrefix(jobKey.APIName) + jobKey.ID + ".fifo"
 }
@@ -57,7 +57,7 @@ func jobKeyFromQueueURL(queueURL string) spec.JobKey {
 
 	jobID := strings.TrimSuffix(dashSplit[len(dashSplit)-1], ".fifo")
 
-	apiNameSplit := dashSplit[1 : len(dashSplit)-1]
+	apiNameSplit := dashSplit[2 : len(dashSplit)-1]
 	apiName := strings.Join(apiNameSplit, "-")
 
 	return spec.JobKey{APIName: apiName, ID: jobID}

pkg/types/clusterconfig/aws_policy.go

@@ -53,7 +53,7 @@ var _cortexPolicy = `
 		{
 			"Effect": "Allow",
 			"Action": "sqs:*",
-			"Resource": "arn:aws:sqs:{{ .Region }}:{{ .AccountID }}:{{ .SQSPrefix }}*"
+			"Resource": "arn:aws:sqs:{{ .Region }}:{{ .AccountID }}:cortex-*"
 		},
 		{
 			"Effect": "Allow",
@@ -89,7 +89,6 @@ type CortexPolicyTemplateArgs struct {
 	LogGroup    string
 	Region      string
 	Bucket      string
-	SQSPrefix   string
 	AccountID   string
 }
 

pkg/types/clusterconfig/cluster_config_aws.go

@@ -682,8 +682,8 @@ func (cc *Config) ToAccessConfig() AccessConfig {
 }
 
 func SQSNamePrefix(clusterName string) string {
-	// 10 was chosen to make sure that other identifiers can be added to the full queue name before reaching the 80 char SQS name limit
-	return hash.String(clusterName)[:10] + "-"
+	// 8 was chosen to make sure that other identifiers can be added to the full queue name before reaching the 80 char SQS name limit
+	return "cortex-" + hash.String(clusterName)[:8] + "-"
 }
 
 // returns hash of cluster name and adds trailing "-"