Fix issues with name lengths.

kief · Mar 27, 2018 · 6796fdc · 6796fdc
1 parent 8e7c793
commit 6796fdc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/service-template/pipeline/Makefile b/service-template/pipeline/Makefile
@@ -29,6 +29,9 @@ apply: init ## Create or update infrastructure
 test: ## Test the infrastructure
 	cd ./test && PIPELINE_NAME=$(SERVICE)-$(COMPONENT)-$(ESTATE_ID)-pipeline ./test-pipeline.sh
 
+vars:
+	@echo "$(TERRAFORM_VARS)"
+
 out:
 	cd ./src && terraform output $(TERRAFORM_VARS)
 

diff --git a/service-template/pipeline/src/packaging_codebuild_role.tf b/service-template/pipeline/src/packaging_codebuild_role.tf
@@ -1,6 +1,6 @@
 
 resource "aws_iam_role" "packaging_codebuild_role" {
-  name = "${var.service}-${var.component}-${var.estate_id}_Packaging_Codebuild_Role"
+  name = "${var.service}-${var.component}-${var.estate_id}_Packager"
 
   assume_role_policy = <<EOF
 {

diff --git a/service-template/pipeline/src/terraform_codebuild_role.tf b/service-template/pipeline/src/terraform_codebuild_role.tf
@@ -1,6 +1,6 @@
 
 resource "aws_iam_role" "terraform_codebuild_role" {
-  name = "${var.service}-${var.component}-${var.estate_id}-TestApply_Terraform_Role"
+  name = "${var.service}-${var.component}-${var.estate_id}-TestApply"
 
   assume_role_policy = <<EOF
 {
@@ -20,7 +20,7 @@ EOF
 
 
 resource "aws_iam_policy" "terraform_codebuild_policy" {
-  name        = "${var.service}-${var.component}-${var.estate_id}-TestApply_Terraform_Policy"
+  name        = "${var.service}-${var.component}-${var.estate_id}-TestApply"
   path        = "/service-role/"
   description = "Policies needed by the CodeBuild project for TestApply the ${var.service}-${var.component}-${var.estate_id} project"
 
@@ -58,7 +58,7 @@ POLICY
 
 
 resource "aws_iam_policy_attachment" "terraform_codebuild_attachment" {
-  name       = "${var.service}-${var.component}-${var.estate_id}-TestApply_Terraform_Attachment"
+  name       = "${var.service}-${var.component}-${var.estate_id}-TestApply"
   policy_arn = "${aws_iam_policy.terraform_codebuild_policy.arn}"
   roles      = ["${aws_iam_role.terraform_codebuild_role.id}"]
 }

diff --git a/service-template/shared-variables.mk b/service-template/shared-variables.mk
@@ -7,7 +7,7 @@ MY_IP=$(shell curl -s icanhazip.com)
 AWS_ACCOUNT_ID:=$(shell aws sts get-caller-identity --output text --query Account)
 STATE_BUCKET_NAME=spin-reference-$(AWS_ACCOUNT_ID)
 STATE_PATH="estate-$(ESTATE_ID)/component-$(COMPONENT)/service-$(SERVICE)/deployment-$(DEPLOYMENT_ID)/$(FUNCTION).tfstate"
-ARTEFACT_BUCKET_NAME=$(shell echo artefacts-$(ESTATE_ID)-$(COMPONENT)-$(SERVICE)-$(AWS_ACCOUNT_ID) | tr '[:upper:]' '[:lower:]')
+ARTEFACT_BUCKET_NAME=$(shell echo repo-$(ESTATE_ID)-$(COMPONENT)-$(SERVICE)-$(AWS_ACCOUNT_ID) | tr '[:upper:]' '[:lower:]' | cut -c 1-63)
 
 ARTEFACT_NAME=$(COMPONENT)-$(SERVICE)
 BUILD_VERSION=1.0.$(shell date +%Y%m%d%I%M%S)