Skip to content

Commit 8fe9377

Browse files
Copilotpelikhan
Copilot
and
pelikhan
authored
Update tests for gh-aw-actions setup-cli in release mode
Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
1 parent 561e225 commit 8fe9377

4 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎pkg/cli/copilot_setup_test.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ jobs:
805805
copilot-setup-steps:
806806
runs-on: ubuntu-latest
807807
steps:
808-
- uses: github/gh-aw/actions/setup-cli@v1.0.0
808+
- uses: github/gh-aw-actions/setup-cli@v1.0.0
809809
with:
810810
version: v1.0.0
811811
`
@@ -917,7 +917,7 @@ jobs:
917917
- name: Checkout repository
918918
uses: actions/checkout@v4
919919
- name: Install gh-aw extension
920-
uses: github/gh-aw/actions/setup-cli@v1.0.0
920+
uses: github/gh-aw-actions/setup-cli@v1.0.0
921921
with:
922922
version: v1.0.0
923923
- name: Verify gh-aw installation
@@ -1065,7 +1065,7 @@ jobs:
10651065
- name: Checkout
10661066
uses: actions/checkout@v4
10671067
- name: Install gh-aw extension
1068-
uses: github/gh-aw/actions/setup-cli@v1.0.0
1068+
uses: github/gh-aw-actions/setup-cli@v1.0.0
10691069
with:
10701070
version: v1.0.0
10711071
`,
@@ -1074,7 +1074,7 @@ jobs:
10741074
resolver: nil,
10751075
expectUpgrade: true,
10761076
validate: func(t *testing.T, got string) {
1077-
if !strings.Contains(got, "uses: github/gh-aw/actions/setup-cli@v2.0.0") {
1077+
if !strings.Contains(got, "uses: github/gh-aw-actions/setup-cli@v2.0.0") {
10781078
t.Errorf("Expected updated uses: line, got:\n%s", got)
10791079
}
10801080
if !strings.Contains(got, "version: v2.0.0") {
@@ -1098,7 +1098,7 @@ jobs:
10981098
runs-on: ubuntu-latest
10991099
steps:
11001100
- name: Install gh-aw extension
1101-
uses: github/gh-aw/actions/setup-cli@v1.0.0
1101+
uses: github/gh-aw-actions/setup-cli@v1.0.0
11021102
with:
11031103
version: v1.0.0
11041104
`,
@@ -1107,7 +1107,7 @@ jobs:
11071107
resolver: &mockSHAResolver{sha: "bd9c0ca491e6334a2797ef56ad6ee89958d54ab9"},
11081108
expectUpgrade: true,
11091109
validate: func(t *testing.T, got string) {
1110-
want := "uses: github/gh-aw/actions/setup-cli@bd9c0ca491e6334a2797ef56ad6ee89958d54ab9 # v2.0.0"
1110+
want := "uses: github/gh-aw-actions/setup-cli@bd9c0ca491e6334a2797ef56ad6ee89958d54ab9 # v2.0.0"
11111111
if !strings.Contains(got, want) {
11121112
t.Errorf("Expected unquoted SHA-pinned uses: line %q, got:\n%s", want, got)
11131113
}
@@ -1126,7 +1126,7 @@ jobs:
11261126
copilot-setup-steps:
11271127
steps:
11281128
- name: Install gh-aw extension
1129-
uses: "github/gh-aw/actions/setup-cli@oldsha # v0.53.2"
1129+
uses: "github/gh-aw-actions/setup-cli@oldsha # v0.53.2"
11301130
with:
11311131
version: v0.53.2
11321132
`,
@@ -1138,7 +1138,7 @@ jobs:
11381138
if strings.Contains(got, `"github/gh-aw`) {
11391139
t.Errorf("Quotes must be stripped from uses: value, got:\n%s", got)
11401140
}
1141-
if !strings.Contains(got, "uses: github/gh-aw/actions/setup-cli@v2.0.0") {
1141+
if !strings.Contains(got, "uses: github/gh-aw-actions/setup-cli@v2.0.0") {
11421142
t.Errorf("Expected updated unquoted uses: line, got:\n%s", got)
11431143
}
11441144
if !strings.Contains(got, "version: v2.0.0") {
@@ -1163,7 +1163,7 @@ jobs:
11631163
content: `jobs:
11641164
copilot-setup-steps:
11651165
steps:
1166-
- uses: github/gh-aw/actions/setup-cli@v1.0.0
1166+
- uses: github/gh-aw-actions/setup-cli@v1.0.0
11671167
with:
11681168
version: v1.0.0
11691169
`,
@@ -1178,7 +1178,7 @@ jobs:
11781178
copilot-setup-steps:
11791179
steps:
11801180
- name: Install gh-aw extension
1181-
uses: github/gh-aw/actions/setup-cli@cb7966564184443e601bd6135d5fbb534300070e # v0.58.0
1181+
uses: github/gh-aw-actions/setup-cli@cb7966564184443e601bd6135d5fbb534300070e # v0.58.0
11821182
with:
11831183
version: v0.53.6
11841184
`,
@@ -1187,7 +1187,7 @@ jobs:
11871187
resolver: &mockSHAResolver{sha: "newsha123"},
11881188
expectUpgrade: true,
11891189
validate: func(t *testing.T, got string) {
1190-
if !strings.Contains(got, "uses: github/gh-aw/actions/setup-cli@newsha123 # v0.60.0") {
1190+
if !strings.Contains(got, "uses: github/gh-aw-actions/setup-cli@newsha123 # v0.60.0") {
11911191
t.Errorf("Expected updated SHA-pinned uses: line, got:\n%s", got)
11921192
}
11931193
if !strings.Contains(got, "version: v0.60.0") {
@@ -1207,7 +1207,7 @@ jobs:
12071207
copilot-setup-steps:
12081208
steps:
12091209
- name: Install gh-aw extension
1210-
uses: github/gh-aw/actions/setup-cli@v0.58.0
1210+
uses: github/gh-aw-actions/setup-cli@v0.58.0
12111211
with:
12121212
version: v0.53.6
12131213
`,
@@ -1216,7 +1216,7 @@ jobs:
12161216
resolver: nil,
12171217
expectUpgrade: true,
12181218
validate: func(t *testing.T, got string) {
1219-
if !strings.Contains(got, "uses: github/gh-aw/actions/setup-cli@v0.60.0") {
1219+
if !strings.Contains(got, "uses: github/gh-aw-actions/setup-cli@v0.60.0") {
12201220
t.Errorf("Expected updated uses: line, got:\n%s", got)
12211221
}
12221222
if !strings.Contains(got, "version: v0.60.0") {
@@ -1287,7 +1287,7 @@ jobs:
12871287
12881288
# Step 2 comment — this step should be updated.
12891289
- name: Install gh-aw extension
1290-
uses: github/gh-aw/actions/setup-cli@v1.0.0
1290+
uses: github/gh-aw-actions/setup-cli@v1.0.0
12911291
with:
12921292
version: v1.0.0
12931293
extra-param: keep-me # this param must not be touched
@@ -1325,7 +1325,7 @@ jobs:
13251325
13261326
# Step 2 comment — this step should be updated.
13271327
- name: Install gh-aw extension
1328-
uses: github/gh-aw/actions/setup-cli@v2.0.0
1328+
uses: github/gh-aw-actions/setup-cli@v2.0.0
13291329
with:
13301330
version: v2.0.0
13311331
extra-param: keep-me # this param must not be touched
@@ -1409,7 +1409,7 @@ jobs:
14091409
- name: Checkout repository
14101410
uses: actions/checkout@v4
14111411
- name: Install gh-aw extension
1412-
uses: github/gh-aw/actions/setup-cli@v1.0.0
1412+
uses: github/gh-aw-actions/setup-cli@v1.0.0
14131413
with:
14141414
version: v1.0.0
14151415
`
@@ -1432,7 +1432,7 @@ jobs:
14321432
updatedStr := string(updated)
14331433

14341434
// The uses: line must be unquoted
1435-
wantUses := "uses: github/gh-aw/actions/setup-cli@" + sha + " # v2.0.0"
1435+
wantUses := "uses: github/gh-aw-actions/setup-cli@" + sha + " # v2.0.0"
14361436
if !strings.Contains(updatedStr, wantUses) {
14371437
t.Errorf("Expected unquoted uses: line %q, got:\n%s", wantUses, updatedStr)
14381438
}

‎pkg/workflow/agentic_workflow_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func TestAgenticWorkflowsInstallStepIncludesGHToken(t *testing.T) {
154154
"MCP setup should include gh-aw installation step when agentic-workflows tool is enabled")
155155

156156
// Verify setup-cli action is used with default token expression
157-
assert.Contains(t, result, "uses: github/gh-aw/actions/setup-cli@",
157+
assert.Contains(t, result, "uses: github/gh-aw-actions/setup-cli@",
158158
"install step should use setup-cli action")
159159
assert.Contains(t, result, "version: 'v0.72.1'",
160160
"install step should install the compiler release version")
@@ -200,7 +200,7 @@ func TestAgenticWorkflowsInstallStepPresentWithoutImport(t *testing.T) {
200200
"dev mode should build and install gh-aw from source")
201201
assert.Contains(t, result, "gh extension install .",
202202
"dev mode should install gh-aw extension from local checkout")
203-
assert.NotContains(t, result, "uses: github/gh-aw/actions/setup-cli@",
203+
assert.NotContains(t, result, "uses: github/gh-aw-actions/setup-cli@",
204204
"dev mode should not use setup-cli action")
205205
}
206206

‎pkg/workflow/maintenance_workflow_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,7 +1434,7 @@ func TestGenerateInstallCLISteps(t *testing.T) {
14341434

14351435
t.Run("release mode generates setup-cli action step", func(t *testing.T) {
14361436
result := generateInstallCLISteps(context.Background(), ActionModeRelease, "v1.0.0", "", nil)
1437-
if !strings.Contains(result, "github/gh-aw/actions/setup-cli@v1.0.0") {
1437+
if !strings.Contains(result, "github/gh-aw-actions/setup-cli@v1.0.0") {
14381438
t.Errorf("Release mode should use setup-cli action with version, got:\n%s", result)
14391439
}
14401440
if !strings.Contains(result, "version: v1.0.0") {
@@ -1455,11 +1455,11 @@ func TestGenerateInstallCLISteps(t *testing.T) {
14551455
t.Run("release mode with resolver uses SHA-pinned setup-cli reference", func(t *testing.T) {
14561456
tmpDir := t.TempDir()
14571457
cache := NewActionCache(tmpDir)
1458-
cache.Set("github/gh-aw/actions/setup-cli", "v1.0.0", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
1458+
cache.Set("github/gh-aw-actions/setup-cli", "v1.0.0", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
14591459
resolver := NewActionResolver(cache)
14601460

14611461
result := generateInstallCLISteps(context.Background(), ActionModeRelease, "v1.0.0", "", resolver)
1462-
expectedRef := "github/gh-aw/actions/setup-cli@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa # v1.0.0"
1462+
expectedRef := "github/gh-aw-actions/setup-cli@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa # v1.0.0"
14631463
if !strings.Contains(result, expectedRef) {
14641464
t.Errorf("Release mode with resolver should use SHA-pinned setup-cli reference %q, got:\n%s", expectedRef, result)
14651465
}
@@ -1488,7 +1488,7 @@ func TestGenerateInstallCLISteps(t *testing.T) {
14881488

14891489
t.Run("release mode without resolver falls back to tag reference", func(t *testing.T) {
14901490
result := generateInstallCLISteps(context.Background(), ActionModeRelease, "v1.0.0", "", nil)
1491-
if !strings.Contains(result, "github/gh-aw/actions/setup-cli@v1.0.0") {
1491+
if !strings.Contains(result, "github/gh-aw-actions/setup-cli@v1.0.0") {
14921492
t.Errorf("Release mode without resolver should fall back to tag reference, got:\n%s", result)
14931493
}
14941494
})
@@ -1564,7 +1564,7 @@ func TestGenerateMaintenanceWorkflow_RunOperationCLICodegen(t *testing.T) {
15641564
if strings.Contains(yaml, "gh extension install") {
15651565
t.Errorf("Release mode should NOT use gh extension install, got:\n%s", yaml)
15661566
}
1567-
if !strings.Contains(yaml, "github/gh-aw/actions/setup-cli@v1.0.0") {
1567+
if !strings.Contains(yaml, "github/gh-aw-actions/setup-cli@v1.0.0") {
15681568
t.Errorf("Release mode run_operation should use setup-cli action, got:\n%s", yaml)
15691569
}
15701570
if !strings.Contains(yaml, "GH_AW_CMD_PREFIX: gh aw") {
@@ -1625,7 +1625,7 @@ func TestGenerateMaintenanceWorkflow_SetupCLISHAPinning(t *testing.T) {
16251625
t.Run("release mode with resolver SHA-pins setup-cli in run_operation", func(t *testing.T) {
16261626
tmpDir := t.TempDir()
16271627
cache := NewActionCache(tmpDir)
1628-
cache.Set("github/gh-aw/actions/setup-cli", "v1.0.0", setupCLISHA)
1628+
cache.Set("github/gh-aw-actions/setup-cli", "v1.0.0", setupCLISHA)
16291629
// Also seed the setup action to keep the test hermetic (GenerateMaintenanceWorkflow
16301630
// calls ResolveSetupActionReference with the same resolver, which would otherwise
16311631
// attempt a real gh api call on a cache miss).
@@ -1649,7 +1649,7 @@ func TestGenerateMaintenanceWorkflow_SetupCLISHAPinning(t *testing.T) {
16491649
t.Fatalf("Expected maintenance workflow to be generated: %v", err)
16501650
}
16511651
yaml := string(content)
1652-
expectedRef := "github/gh-aw/actions/setup-cli@" + setupCLISHA + " # v1.0.0"
1652+
expectedRef := "github/gh-aw-actions/setup-cli@" + setupCLISHA + " # v1.0.0"
16531653
if !strings.Contains(yaml, expectedRef) {
16541654
t.Errorf("Expected SHA-pinned setup-cli reference %q in generated workflow, got:\n%s", expectedRef, yaml)
16551655
}

‎pkg/workflow/runtime_gh_aw_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestRuntimesConfigToMap_GhAw(t *testing.T) {
2828
GhAw: &RuntimeConfig{
2929
Version: "v1.2.3",
3030
If: "github.event_name == 'push'",
31-
ActionRepo: "github/gh-aw/actions/setup-cli",
31+
ActionRepo: "github/gh-aw-actions/setup-cli",
3232
ActionVersion: "v0.72.1",
3333
},
3434
})
@@ -39,7 +39,7 @@ func TestRuntimesConfigToMap_GhAw(t *testing.T) {
3939
require.True(t, ok)
4040
assert.Equal(t, "v1.2.3", ghAw["version"])
4141
assert.Equal(t, "github.event_name == 'push'", ghAw["if"])
42-
assert.Equal(t, "github/gh-aw/actions/setup-cli", ghAw["action-repo"])
42+
assert.Equal(t, "github/gh-aw-actions/setup-cli", ghAw["action-repo"])
4343
assert.Equal(t, "v0.72.1", ghAw["action-version"])
4444
}
4545

@@ -115,7 +115,7 @@ func TestGenerateRuntimeSetupSteps_GhAw_DevBuildsFromSource(t *testing.T) {
115115
assert.Contains(t, content, "gh extension install .")
116116
assert.Contains(t, content, "gh aw version")
117117
assert.Contains(t, content, "GH_TOKEN: ${{ github.token }}")
118-
assert.NotContains(t, content, "github/gh-aw/actions/setup-cli@")
118+
assert.NotContains(t, content, "github/gh-aw-actions/setup-cli@")
119119
}
120120

121121
func TestGenerateRuntimeSetupSteps_GhAw_ReleaseUsesSetupCLI(t *testing.T) {
@@ -139,7 +139,7 @@ func TestGenerateRuntimeSetupSteps_GhAw_ReleaseUsesSetupCLI(t *testing.T) {
139139
require.NotEmpty(t, steps)
140140

141141
content := strings.Join(steps[0], "\n")
142-
assert.Contains(t, content, "uses: github/gh-aw/actions/setup-cli@")
142+
assert.Contains(t, content, "uses: github/gh-aw-actions/setup-cli@")
143143
assert.Contains(t, content, "version: 'v0.72.1'")
144144
}
145145

@@ -159,7 +159,7 @@ func TestGenerateRuntimeSetupSteps_GhAw_ReleaseUsesWorkflowDataPin(t *testing.T)
159159

160160
cache := NewActionCache(t.TempDir())
161161
sha := "0123456789abcdef0123456789abcdef01234567"
162-
cache.Set("github/gh-aw/actions/setup-cli", "v0.72.1", sha)
162+
cache.Set("github/gh-aw-actions/setup-cli", "v0.72.1", sha)
163163

164164
data := &WorkflowData{
165165
Ctx: context.Background(),
@@ -173,6 +173,6 @@ func TestGenerateRuntimeSetupSteps_GhAw_ReleaseUsesWorkflowDataPin(t *testing.T)
173173
require.NotEmpty(t, steps)
174174

175175
content := strings.Join(steps[0], "\n")
176-
assert.Contains(t, content, "uses: github/gh-aw/actions/setup-cli@"+sha)
176+
assert.Contains(t, content, "uses: github/gh-aw-actions/setup-cli@"+sha)
177177
assert.Contains(t, content, "version: 'v0.72.1'")
178178
}

0 commit comments

Comments
 (0)