Skip to content

Commit fd9bba7

Browse files
author
Jeffrey Koehler
committed
Remove service name and service environment
1 parent 1a141e7 commit fd9bba7

File tree

3 files changed

+20
-57
lines changed

3 files changed

+20
-57
lines changed

‎.github/workflows/test-versioning.yml

-32
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ jobs:
1111
with:
1212
DISCORD_BOT_TOKEN: ${{ secrets.BUILD_BOT_TOKEN }}
1313
DISCORD_CHANNEL: "923504689214025728"
14-
SERVICE_NAME: "action"
15-
SERVICE_ENVIRONMENT: "PRODUCTION"
1614
STAGE: "test"
1715
STAGE_STATUS: "Init"
1816
DISCORD_THREAD_ID: ""
@@ -28,8 +26,6 @@ jobs:
2826
with:
2927
DISCORD_BOT_TOKEN: ${{ secrets.BUILD_BOT_TOKEN }}
3028
DISCORD_CHANNEL: "923504689214025728"
31-
SERVICE_NAME: "action"
32-
SERVICE_ENVIRONMENT: "PRODUCTION"
3329
STAGE: "test"
3430
STAGE_STATUS: "testing"
3531
DISCORD_THREAD_ID: ${{ steps.initialNotice.outputs.DISCORD_THREAD_ID }}
@@ -45,8 +41,6 @@ jobs:
4541
with:
4642
DISCORD_BOT_TOKEN: ${{ secrets.BUILD_BOT_TOKEN }}
4743
DISCORD_CHANNEL: "923504689214025728"
48-
SERVICE_NAME: "action"
49-
SERVICE_ENVIRONMENT: "PRODUCTION"
5044
STAGE: "test"
5145
STAGE_STATUS: "linting"
5246
DISCORD_THREAD_ID: ${{ steps.initialNotice.outputs.DISCORD_THREAD_ID }}
@@ -62,8 +56,6 @@ jobs:
6256
with:
6357
DISCORD_BOT_TOKEN: ${{ secrets.BUILD_BOT_TOKEN }}
6458
DISCORD_CHANNEL: "923504689214025728"
65-
SERVICE_NAME: "action"
66-
SERVICE_ENVIRONMENT: "PRODUCTION"
6759
STAGE: "test"
6860
STAGE_STATUS: "Cleaning"
6961
DISCORD_THREAD_ID: ${{ steps.initialNotice.outputs.DISCORD_THREAD_ID }}
@@ -79,8 +71,6 @@ jobs:
7971
with:
8072
DISCORD_BOT_TOKEN: ${{ secrets.BUILD_BOT_TOKEN }}
8173
DISCORD_CHANNEL: "923504689214025728"
82-
SERVICE_NAME: "action"
83-
SERVICE_ENVIRONMENT: "PRODUCTION"
8474
STAGE: "build"
8575
STAGE_STATUS: "Pulling Files"
8676
DISCORD_THREAD_ID: ${{ steps.initialNotice.outputs.DISCORD_THREAD_ID }}
@@ -96,8 +86,6 @@ jobs:
9686
with:
9787
DISCORD_BOT_TOKEN: ${{ secrets.BUILD_BOT_TOKEN }}
9888
DISCORD_CHANNEL: "923504689214025728"
99-
SERVICE_NAME: "action"
100-
SERVICE_ENVIRONMENT: "PRODUCTION"
10189
STAGE: "build"
10290
STAGE_STATUS: "Compiling"
10391
DISCORD_THREAD_ID: ${{ steps.initialNotice.outputs.DISCORD_THREAD_ID }}
@@ -113,8 +101,6 @@ jobs:
113101
with:
114102
DISCORD_BOT_TOKEN: ${{ secrets.BUILD_BOT_TOKEN }}
115103
DISCORD_CHANNEL: "923504689214025728"
116-
SERVICE_NAME: "action"
117-
SERVICE_ENVIRONMENT: "PRODUCTION"
118104
STAGE: "build"
119105
STAGE_STATUS: "Docker Building"
120106
DISCORD_THREAD_ID: ${{ steps.initialNotice.outputs.DISCORD_THREAD_ID }}
@@ -130,8 +116,6 @@ jobs:
130116
with:
131117
DISCORD_BOT_TOKEN: ${{ secrets.BUILD_BOT_TOKEN }}
132118
DISCORD_CHANNEL: "923504689214025728"
133-
SERVICE_NAME: "action"
134-
SERVICE_ENVIRONMENT: "PRODUCTION"
135119
STAGE: "e2e"
136120
STAGE_STATUS: "Loading terraform"
137121
DISCORD_THREAD_ID: ${{ steps.initialNotice.outputs.DISCORD_THREAD_ID }}
@@ -147,8 +131,6 @@ jobs:
147131
with:
148132
DISCORD_BOT_TOKEN: ${{ secrets.BUILD_BOT_TOKEN }}
149133
DISCORD_CHANNEL: "923504689214025728"
150-
SERVICE_NAME: "action"
151-
SERVICE_ENVIRONMENT: "PRODUCTION"
152134
STAGE: "e2e"
153135
STAGE_STATUS: "starting images"
154136
DISCORD_THREAD_ID: ${{ steps.initialNotice.outputs.DISCORD_THREAD_ID }}
@@ -164,8 +146,6 @@ jobs:
164146
with:
165147
DISCORD_BOT_TOKEN: ${{ secrets.BUILD_BOT_TOKEN }}
166148
DISCORD_CHANNEL: "923504689214025728"
167-
SERVICE_NAME: "action"
168-
SERVICE_ENVIRONMENT: "PRODUCTION"
169149
STAGE: "e2e"
170150
STAGE_STATUS: "e2e-testing"
171151
DISCORD_THREAD_ID: ${{ steps.initialNotice.outputs.DISCORD_THREAD_ID }}
@@ -181,8 +161,6 @@ jobs:
181161
with:
182162
DISCORD_BOT_TOKEN: ${{ secrets.BUILD_BOT_TOKEN }}
183163
DISCORD_CHANNEL: "923504689214025728"
184-
SERVICE_NAME: "action"
185-
SERVICE_ENVIRONMENT: "PRODUCTION"
186164
STAGE: "e2e"
187165
STAGE_STATUS: "Complete"
188166
DISCORD_THREAD_ID: ${{ steps.initialNotice.outputs.DISCORD_THREAD_ID }}
@@ -198,8 +176,6 @@ jobs:
198176
with:
199177
DISCORD_BOT_TOKEN: ${{ secrets.BUILD_BOT_TOKEN }}
200178
DISCORD_CHANNEL: "923504689214025728"
201-
SERVICE_NAME: "action"
202-
SERVICE_ENVIRONMENT: "PRODUCTION"
203179
STAGE: "deploy"
204180
STAGE_STATUS: "Connecting"
205181
DISCORD_THREAD_ID: ${{ steps.initialNotice.outputs.DISCORD_THREAD_ID }}
@@ -215,8 +191,6 @@ jobs:
215191
with:
216192
DISCORD_BOT_TOKEN: ${{ secrets.BUILD_BOT_TOKEN }}
217193
DISCORD_CHANNEL: "923504689214025728"
218-
SERVICE_NAME: "action"
219-
SERVICE_ENVIRONMENT: "PRODUCTION"
220194
STAGE: "deploy"
221195
STAGE_STATUS: "Update Image"
222196
DISCORD_THREAD_ID: ${{ steps.initialNotice.outputs.DISCORD_THREAD_ID }}
@@ -232,8 +206,6 @@ jobs:
232206
with:
233207
DISCORD_BOT_TOKEN: ${{ secrets.BUILD_BOT_TOKEN }}
234208
DISCORD_CHANNEL: "923504689214025728"
235-
SERVICE_NAME: "action"
236-
SERVICE_ENVIRONMENT: "PRODUCTION"
237209
STAGE: "deploy"
238210
STAGE_STATUS: "rollout"
239211
DISCORD_THREAD_ID: ${{ steps.initialNotice.outputs.DISCORD_THREAD_ID }}
@@ -249,8 +221,6 @@ jobs:
249221
with:
250222
DISCORD_BOT_TOKEN: ${{ secrets.BUILD_BOT_TOKEN }}
251223
DISCORD_CHANNEL: "923504689214025728"
252-
SERVICE_NAME: "action"
253-
SERVICE_ENVIRONMENT: "PRODUCTION"
254224
STAGE: "complete"
255225
STAGE_STATUS: "Complete"
256226
DISCORD_THREAD_ID: ${{ steps.initialNotice.outputs.DISCORD_THREAD_ID }}
@@ -266,8 +236,6 @@ jobs:
266236
with:
267237
DISCORD_BOT_TOKEN: ${{ secrets.BUILD_BOT_TOKEN }}
268238
DISCORD_CHANNEL: "923504689214025728"
269-
SERVICE_NAME: "action"
270-
SERVICE_ENVIRONMENT: "PRODUCTION"
271239
STAGE: "deploy"
272240
STAGE_STATUS: "Rollout Failed"
273241
DISCORD_THREAD_ID: ${{ steps.initialNotice.outputs.DISCORD_THREAD_ID }}

‎action.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,13 @@ inputs:
1212
DISCORD_CHANNEL:
1313
description: "the ID of the channel to send the message to."
1414
required: true
15-
SERVICE_NAME:
16-
description: "The name of the service being worked in"
17-
required: true
18-
SERVICE_ENVIRONMENT:
19-
description: "the environment being executed in"
20-
required: true
2115
STAGE:
2216
description: "What stage of the build currently being executed. Shoul be one of test,build,e2e,final-build,deploy,complete"
2317
required: true
2418
STAGE_STATUS:
2519
description: "The value to use to update the top level indicator"
2620
required: true
21+
2722
DISCORD_THREAD_ID:
2823
description: "The id of the thread to post the message in. DISCORD_THREAD_ID and DISCORD_THREAD_MESSAGE_ID must be set tegother if set."
2924
required: false

‎main.go

+19-19
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package main
22

33
import (
44
"fmt"
5-
"strings"
65
"time"
76

87
discord "github.com/bwmarrin/discordgo"
@@ -57,16 +56,6 @@ func main() {
5756
gh.Fatalf("DISCORD_CHANNEL is required")
5857
return
5958
}
60-
service := gh.GetInput("SERVICE_NAME")
61-
if service == "" {
62-
gh.Fatalf("SERVICE_NAME is required")
63-
return
64-
}
65-
environment := gh.GetInput("SERVICE_ENVIRONMENT")
66-
if environment == "" {
67-
gh.Fatalf("SERVICE_ENVIRONMENT is required")
68-
return
69-
}
7059
stage := gh.GetInput("STAGE")
7160
if stage == "" {
7261
gh.Fatalf("STAGE is required")
@@ -317,21 +306,27 @@ func getRunURL() (string, error) {
317306
return fmt.Sprintf("%s/%s/%s/actions/runs/%d", ctx.ServerURL, owner, name, ctx.RunID), nil
318307
}
319308

320-
func getEmbedTitle() string {
321-
service := gh.GetInput("SERVICE_NAME")
322-
environment := gh.GetInput("SERVICE_ENVIRONMENT")
323-
return strings.ToUpper(fmt.Sprintf("%s %s DEPLOYMENT", service, environment))
309+
func getEmbedTitle() (string, error) {
310+
ctx, err := gh.Context()
311+
if err != nil {
312+
return "", errors.Wrap(err, "failed to get github context")
313+
}
314+
315+
_, service := ctx.Repo()
316+
317+
environment := ctx.RefName
318+
return fmt.Sprintf("%s/%s", service, environment), nil
324319
}
325320

326321
func getThreadTitle() (string, error) {
327322
ctx, err := gh.Context()
328323
if err != nil {
329324
return "", errors.Wrap(err, "failed to get github context")
330325
}
331-
service := gh.GetInput("SERVICE_NAME")
332-
environment := gh.GetInput("SERVICE_ENVIRONMENT")
326+
_, service := ctx.Repo()
327+
environment := ctx.RefName
333328

334-
return strings.ToUpper(fmt.Sprintf("%s %s DEPLOYMENT %d", service, environment, ctx.RunID)), nil
329+
return fmt.Sprintf("%s/%s:%d", service, environment, ctx.RunID), nil
335330
}
336331

337332
func getThreadHeaderEmbedContent(fail bool) (*discord.MessageEmbed, error) {
@@ -413,11 +408,16 @@ func getThreadHeaderEmbedContent(fail bool) (*discord.MessageEmbed, error) {
413408
color = RedColor
414409
}
415410

411+
embedTitle, err := getEmbedTitle()
412+
if err != nil {
413+
return nil, errors.Wrap(err, "failed to get embed title for embed content")
414+
}
415+
416416
embed := &discord.MessageEmbed{
417417
Type: discord.EmbedTypeRich,
418418
Author: &discord.MessageEmbedAuthor{
419419
URL: runUrl,
420-
Name: getEmbedTitle(),
420+
Name: embedTitle,
421421
},
422422
Fields: fields,
423423
Color: color,

0 commit comments

Comments
 (0)