Skip to content

Commit bd1fd71

Browse files
author
Matt Calhoun
authored
rename randomseed to randomidentifier (#35)
1 parent dfc34d9 commit bd1fd71

6 files changed

Lines changed: 11 additions & 76 deletions

File tree

go.sum

Lines changed: 0 additions & 65 deletions
Large diffs are not rendered by default.

pkg/atmos/aws-component-helper/atmos.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ import (
1212

1313
func GetAtmosOptions(t *testing.T, suite *TestSuite, componentName string, stackName string, vars map[string]interface{}) *atmos.Options {
1414
mergedVars := map[string]interface{}{
15-
"attributes": []string{suite.RandomSeed},
15+
"attributes": []string{suite.RandomIdentifier},
1616
"region": suite.AwsRegion,
1717
}
1818

1919
// If we are not skipping the nuking of the test account, add the default tags
2020
if !suite.SkipNukeTestAccount {
2121
nukeVars := map[string]interface{}{
2222
"default_tags": map[string]string{
23-
"CreatedByTerratestRun": suite.RandomSeed,
23+
"CreatedByTerratestRun": suite.RandomIdentifier,
2424
},
2525
}
2626

@@ -38,7 +38,7 @@ func GetAtmosOptions(t *testing.T, suite *TestSuite, componentName string, stack
3838
Stack: stackName,
3939
NoColor: true,
4040
BackendConfig: map[string]interface{}{
41-
"workspace_key_prefix": strings.Join([]string{suite.RandomSeed, stackName}, "-"),
41+
"workspace_key_prefix": strings.Join([]string{suite.RandomIdentifier, stackName}, "-"),
4242
},
4343
Vars: mergedVars,
4444
})

pkg/atmos/aws-component-helper/setup_test_suite.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func readOrCreateTestSuiteFile(testSuite *TestSuite, testName string) (*TestSuit
8989
return testSuite, nil
9090
} else {
9191
randID := random.UniqueId()
92-
testSuite.RandomSeed = strings.ToLower(randID)
92+
testSuite.RandomIdentifier = strings.ToLower(randID)
9393

9494
testSuite.TempDir, err = os.MkdirTemp("", testName)
9595
if err != nil {

pkg/atmos/aws-component-helper/setup_test_suite_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func TestReadOrCreateTestSuiteFile(t *testing.T) {
6969

7070
result, err := readOrCreateTestSuiteFile(ts, testName)
7171
assert.NoError(t, err)
72-
assert.NotEmpty(t, result.RandomSeed)
72+
assert.NotEmpty(t, result.RandomIdentifier)
7373
assert.NotEmpty(t, result.TempDir)
7474

7575
// Verify file was created
@@ -83,8 +83,8 @@ func TestReadOrCreateTestSuiteFile(t *testing.T) {
8383
t.Run("read existing test suite file", func(t *testing.T) {
8484
// Create a test suite file
8585
existingTS := &TestSuite{
86-
RandomSeed: "test-seed",
87-
TempDir: "test-dir",
86+
RandomIdentifier: "test-seed",
87+
TempDir: "test-dir",
8888
}
8989
data, err := json.MarshalIndent(existingTS, "", " ")
9090
assert.NoError(t, err)
@@ -95,10 +95,10 @@ func TestReadOrCreateTestSuiteFile(t *testing.T) {
9595
ts := &TestSuite{}
9696
result, err := readOrCreateTestSuiteFile(ts, "test_")
9797
assert.NoError(t, err)
98-
assert.Equal(t, existingTS.RandomSeed, result.RandomSeed)
98+
assert.Equal(t, existingTS.RandomIdentifier, result.RandomIdentifier)
9999
assert.Equal(t, existingTS.TempDir, result.TempDir)
100100

101101
// Clean up
102102
os.Remove(testSuiteFile)
103103
})
104-
}
104+
}

pkg/atmos/aws-component-helper/test_suite.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type TestSuite struct {
1515
ComponentSrcPath string
1616
Dependencies []*Dependency
1717
FixturesPath string
18-
RandomSeed string
18+
RandomIdentifier string
1919
SkipSetupComponentUnderTest bool
2020
SkipDeployDependencies bool
2121
SkipDeployComponentUnderTest bool

test/aws-component-helper/test/basic_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ func TestBasic(t *testing.T) {
5353
require.NoError(t, err)
5454

5555
revision := atmos.Output(t, suite.AtmosOptions, "revision")
56-
expected := fmt.Sprintf("%s-%s", strings.ToLower(suite.RandomSeed), additionalVars["revision"])
56+
expected := fmt.Sprintf("%s-%s", strings.ToLower(suite.RandomIdentifier), additionalVars["revision"])
5757
require.Equal(t, expected, revision)
5858
}

0 commit comments

Comments
 (0)