feat: add SEMAPHORE_AGENT_TAG_NAME parameter (#91)

renderedtext · Oct 31, 2022 · 8fb0d33 · 8fb0d33
1 parent 8d434e0
commit 8fb0d33
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 5 deletions.
diff --git a/bin/aws-semaphore-agent.js b/bin/aws-semaphore-agent.js
@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 
-const { App } = require('aws-cdk-lib');
+const { App, Tags } = require('aws-cdk-lib');
 const { AwsSemaphoreAgentStack } = require('../lib/aws-semaphore-agent-stack');
 const { ArgumentStore } = require('../lib/argument-store');
 const { getKeys } = require('../lib/github-keys');
 
 const app = new App();
 const argumentStore = buildArgumentStore();
 
-new AwsSemaphoreAgentStack(app, 'AwsSemaphoreAgentStack', {
+const awsSemaphoreAgentStack = new AwsSemaphoreAgentStack(app, 'AwsSemaphoreAgentStack', {
   stackName: argumentStore.get("SEMAPHORE_AGENT_STACK_NAME"),
   description: "Semaphore agent autoscaling stack",
   argumentStore: argumentStore,
@@ -20,6 +20,10 @@ new AwsSemaphoreAgentStack(app, 'AwsSemaphoreAgentStack', {
   },
 });
 
+argumentStore.getTags().forEach(tag => {
+  Tags.of(awsSemaphoreAgentStack).add(tag.key, tag.value);
+});
+
 function buildArgumentStore() {
   try {
     return ArgumentStore.fromEnv();

diff --git a/execution-policy.json b/execution-policy.json
@@ -80,7 +80,8 @@
         "lambda:DeleteFunction",
         "lambda:InvokeFunction",
         "lambda:UpdateFunctionCode",
-        "lambda:UpdateFunctionConfiguration"
+        "lambda:UpdateFunctionConfiguration",
+        "lambda:TagResource"
       ],
       "Resource": "arn:aws:lambda:*:*:function:*"
     },
@@ -101,7 +102,8 @@
         "ssm:GetParameter",
         "ssm:GetParameters",
         "ssm:PutParameter",
-        "ssm:DeleteParameter"
+        "ssm:DeleteParameter",
+        "ssm:AddTagsToResource"
       ],
       "Resource": "*"
     },

diff --git a/lib/argument-store.js b/lib/argument-store.js
@@ -28,7 +28,8 @@ class ArgumentStore {
     "SEMAPHORE_AGENT_MANAGED_POLICY_NAMES": "",
     "SEMAPHORE_AGENT_VOLUME_NAME": "",
     "SEMAPHORE_AGENT_VOLUME_TYPE": "gp2",
-    "SEMAPHORE_AGENT_VOLUME_SIZE": "64"
+    "SEMAPHORE_AGENT_VOLUME_SIZE": "64",
+    "SEMAPHORE_AGENT_TAGS": ""
   }
 
   constructor() {
@@ -125,6 +126,21 @@ class ArgumentStore {
     return this.get("SEMAPHORE_ENDPOINT");
   }
 
+  getTags() {
+    var tags = [];
+    // example tag value = 'Name:Something,Category:SomethingElse'
+    if (!this.isEmpty("SEMAPHORE_AGENT_TAGS")) {
+      tags = this.get("SEMAPHORE_AGENT_TAGS").split(",").map(tagPair => {
+        const [key, value] = tagPair.trim().split(":");
+        return {
+          key: key.trim(),
+          value: value.trim(),
+        };
+      });
+    }
+    return tags;
+  }
+
   // We only allow SSH ingress if a EC2 key has been specified.
   // Access to Windows instances happen through AWS Systems Manager,
   // so no need to allow SSH ingress for those as well.

diff --git a/test/argument-store.test.js b/test/argument-store.test.js
@@ -0,0 +1,33 @@
+const { ArgumentStore } = require("../lib/argument-store");
+
+describe("get tags", () => {
+  test("empty tags", () => {
+    const argumentStore = ArgumentStore.fromMap({
+      SEMAPHORE_AGENT_STACK_NAME: "test-stack",
+      SEMAPHORE_ORGANIZATION: "test",
+      SEMAPHORE_AGENT_TOKEN_PARAMETER_NAME: "test-token"
+    });
+    const tags = argumentStore.getTags();
+    expect(tags).toEqual([]);
+  });
+
+  test("multiple tags", () => {
+    const argumentStore = ArgumentStore.fromMap({
+      SEMAPHORE_AGENT_STACK_NAME: "test-stack",
+      SEMAPHORE_ORGANIZATION: "test",
+      SEMAPHORE_AGENT_TOKEN_PARAMETER_NAME: "test-token",
+      SEMAPHORE_AGENT_TAGS: " Name : Something ,Category:SomethingElse"
+    });
+    const tags = argumentStore.getTags();
+    expect(tags).toEqual([
+      {
+        key: "Name",
+        value: "Something",
+      },
+      {
+        key: "Category",
+        value: "SomethingElse",
+      },
+    ]);
+  });
+})