Skip to content

Commit 99572f2

Browse files
committed
wip
1 parent fc3f355 commit 99572f2

8 files changed

+2634
-274
lines changed

internal/services/jobs/definition.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func ResourceDefinition() *schema.Resource {
111111
"secret_version": {
112112
Type: schema.TypeString,
113113
Description: "The secret version, default to Latest.",
114-
Optional: true,
114+
Required: true,
115115
},
116116
"file": {
117117
Type: schema.TypeString,

internal/services/jobs/definition_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func TestAccJobDefinition_Cron(t *testing.T) {
161161
})
162162
}
163163

164-
func TestAccCreateJobDefinitionWithSecretReference(t *testing.T) {
164+
func TestAccCreateJobDefinition_SecretReference(t *testing.T) {
165165
tt := acctest.NewTestTools(t)
166166
defer tt.Cleanup()
167167
resource.ParallelTest(t, resource.TestCase{
@@ -255,7 +255,7 @@ func TestAccCreateJobDefinitionWithSecretReference(t *testing.T) {
255255
})
256256
}
257257

258-
func TestAccCreateJobDefinitionWrongSecretReference(t *testing.T) {
258+
func TestAccCreateJobDefinition_WrongSecretReference(t *testing.T) {
259259
tt := acctest.NewTestTools(t)
260260
defer tt.Cleanup()
261261

@@ -285,6 +285,7 @@ func TestAccCreateJobDefinitionWrongSecretReference(t *testing.T) {
285285
image_uri = "docker.io/alpine:latest"
286286
secret_reference {
287287
secret_id = local.secret_uuid
288+
secret_version = "1"
288289
}
289290
}
290291
`,

internal/services/jobs/helpers.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -139,26 +139,21 @@ func CreateJobDefinitionSecret(rawSecretReference any, api *jobs.API, region scw
139139
secrets := []*jobs.CreateJobDefinitionSecretsRequestSecretConfig{}
140140

141141
for _, parsedSecretRef := range parsedSecretReferences {
142-
secretVersion := "Latest"
143-
144-
if parsedSecretRef.SecretVersion != "" {
145-
secretVersion = parsedSecretRef.SecretVersion
146-
}
147142

148143
var secretConfig *jobs.CreateJobDefinitionSecretsRequestSecretConfig
149144

150145
if parsedSecretRef.Environment != "" {
151146
secretConfig = &jobs.CreateJobDefinitionSecretsRequestSecretConfig{
152147
SecretManagerID: parsedSecretRef.SecretID,
153-
SecretManagerVersion: secretVersion,
148+
SecretManagerVersion: parsedSecretRef.SecretVersion,
154149
EnvVarName: &parsedSecretRef.Environment,
155150
}
156151
}
157152

158153
if parsedSecretRef.File != "" {
159154
secretConfig = &jobs.CreateJobDefinitionSecretsRequestSecretConfig{
160155
SecretManagerID: parsedSecretRef.SecretID,
161-
SecretManagerVersion: secretVersion,
156+
SecretManagerVersion: parsedSecretRef.SecretVersion,
162157
Path: &parsedSecretRef.File,
163158
}
164159
}

0 commit comments

Comments
 (0)