Skip to content

Commit 3f238a7

Browse files
helenjwhelenjw
committed
use oidc_configuration_type and oidc_configuration_id
1 parent 21f5d8b commit 3f238a7

File tree

3 files changed

+103
-125
lines changed

3 files changed

+103
-125
lines changed

‎internal/provider/resource_tfe_hyok_configuration.go‎

Lines changed: 73 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,32 @@ type resourceTFEHYOKConfiguration struct {
3535
}
3636

3737
type modelTFEHYOKConfiguration struct {
38-
ID types.String `tfsdk:"id"`
39-
Name types.String `tfsdk:"name"`
40-
KEKID types.String `tfsdk:"kek_id"`
41-
KMSOptions *modelTFEKMSOptions `tfsdk:"kms_options"`
42-
43-
AWSOIDCConfigurationID types.String `tfsdk:"aws_oidc_configuration_id"`
44-
GCPOIDCConfigurationID types.String `tfsdk:"gcp_oidc_configuration_id"`
45-
VaultOIDCConfigurationID types.String `tfsdk:"vault_oidc_configuration_id"`
46-
AzureOIDCConfigurationID types.String `tfsdk:"azure_oidc_configuration_id"`
47-
48-
AgentPoolID types.String `tfsdk:"agent_pool_id"`
49-
Organization types.String `tfsdk:"organization"`
38+
ID types.String `tfsdk:"id"`
39+
Name types.String `tfsdk:"name"`
40+
KEKID types.String `tfsdk:"kek_id"`
41+
KMSOptions *modelTFEKMSOptions `tfsdk:"kms_options"`
42+
OIDCConfigurationID types.String `tfsdk:"oidc_configuration_id"`
43+
OIDCConfigurationType types.String `tfsdk:"oidc_configuration_type"`
44+
AgentPoolID types.String `tfsdk:"agent_pool_id"`
45+
Organization types.String `tfsdk:"organization"`
46+
}
47+
48+
func (m *modelTFEHYOKConfiguration) TFEOIDCConfigurationTypeChoice() *tfe.OIDCConfigurationTypeChoice {
49+
var typeChoice *tfe.OIDCConfigurationTypeChoice
50+
id := m.OIDCConfigurationID.ValueString()
51+
52+
switch m.OIDCConfigurationType.ValueString() {
53+
case OIDCConfigurationTypeAWS:
54+
typeChoice = &tfe.OIDCConfigurationTypeChoice{AWSOIDCConfiguration: &tfe.AWSOIDCConfiguration{ID: id}}
55+
case OIDCConfigurationTypeGCP:
56+
typeChoice = &tfe.OIDCConfigurationTypeChoice{GCPOIDCConfiguration: &tfe.GCPOIDCConfiguration{ID: id}}
57+
case OIDCConfigurationTypeVault:
58+
typeChoice = &tfe.OIDCConfigurationTypeChoice{VaultOIDCConfiguration: &tfe.VaultOIDCConfiguration{ID: id}}
59+
case OIDCConfigurationTypeAzure:
60+
typeChoice = &tfe.OIDCConfigurationTypeChoice{AzureOIDCConfiguration: &tfe.AzureOIDCConfiguration{ID: id}}
61+
}
62+
63+
return typeChoice
5064
}
5165

5266
type modelTFEKMSOptions struct {
@@ -55,6 +69,26 @@ type modelTFEKMSOptions struct {
5569
KeyRingID types.String `tfsdk:"key_ring_id"`
5670
}
5771

72+
func (m *modelTFEKMSOptions) TFEKMSOptions() *tfe.KMSOptions {
73+
var kmsOptions *tfe.KMSOptions
74+
if m != nil {
75+
kmsOptions = &tfe.KMSOptions{
76+
KeyRegion: m.KeyRegion.ValueString(),
77+
KeyLocation: m.KeyLocation.ValueString(),
78+
KeyRingID: m.KeyRingID.ValueString(),
79+
}
80+
}
81+
return kmsOptions
82+
}
83+
84+
// List all available OIDC configuration types.
85+
const (
86+
OIDCConfigurationTypeAWS string = "aws"
87+
OIDCConfigurationTypeGCP string = "gcp"
88+
OIDCConfigurationTypeVault string = "vault"
89+
OIDCConfigurationTypeAzure string = "azure"
90+
)
91+
5892
func (r *resourceTFEHYOKConfiguration) Configure(_ context.Context, req resource.ConfigureRequest, resp *resource.ConfigureResponse) {
5993
// Prevent panic if the provider has not been configured.
6094
if req.ProviderData == nil {
@@ -93,44 +127,23 @@ func (r *resourceTFEHYOKConfiguration) Schema(_ context.Context, _ resource.Sche
93127
Description: "Refers to the name of your key encryption key stored in your key management service.",
94128
Required: true,
95129
},
96-
"aws_oidc_configuration_id": schema.StringAttribute{
97-
Description: "The ID of the TFE AWS OIDC configuration.",
98-
Optional: true,
99-
PlanModifiers: []planmodifier.String{
100-
stringplanmodifier.RequiresReplace(),
101-
},
102-
Validators: []validator.String{
103-
validateSingleOIDCConfigurationChoice(),
104-
},
105-
},
106-
"gcp_oidc_configuration_id": schema.StringAttribute{
107-
Description: "The ID of the TFE HYOK configuration.",
108-
Optional: true,
109-
PlanModifiers: []planmodifier.String{
110-
stringplanmodifier.RequiresReplace(),
111-
},
112-
Validators: []validator.String{
113-
validateSingleOIDCConfigurationChoice(),
114-
},
115-
},
116-
"vault_oidc_configuration_id": schema.StringAttribute{
117-
Description: "The ID of the TFE Vault OIDC configuration.",
118-
Optional: true,
119-
PlanModifiers: []planmodifier.String{
120-
stringplanmodifier.RequiresReplace(),
121-
},
122-
Validators: []validator.String{
123-
validateSingleOIDCConfigurationChoice(),
124-
},
130+
"oidc_configuration_id": schema.StringAttribute{
131+
Description: "The ID of the TFE OIDC configuration.",
132+
Required: true,
125133
},
126-
"azure_oidc_configuration_id": schema.StringAttribute{
127-
Description: "The ID of the TFE Azure OIDC configuration.",
128-
Optional: true,
134+
"oidc_configuration_type": schema.StringAttribute{
135+
Description: "The type of the TFE OIDC configuration.",
136+
Required: true,
129137
PlanModifiers: []planmodifier.String{
130138
stringplanmodifier.RequiresReplace(),
131139
},
132140
Validators: []validator.String{
133-
validateSingleOIDCConfigurationChoice(),
141+
stringvalidator.OneOf(
142+
string(OIDCConfigurationTypeAWS),
143+
string(OIDCConfigurationTypeGCP),
144+
string(OIDCConfigurationTypeVault),
145+
string(OIDCConfigurationTypeAzure),
146+
),
134147
},
135148
},
136149
"agent_pool_id": schema.StringAttribute{
@@ -175,15 +188,6 @@ func (r *resourceTFEHYOKConfiguration) Schema(_ context.Context, _ resource.Sche
175188
}
176189
}
177190

178-
func validateSingleOIDCConfigurationChoice() validator.String {
179-
return stringvalidator.ExactlyOneOf(
180-
path.MatchRoot("aws_oidc_configuration_id"),
181-
path.MatchRoot("gcp_oidc_configuration_id"),
182-
path.MatchRoot("azure_oidc_configuration_id"),
183-
path.MatchRoot("vault_oidc_configuration_id"),
184-
)
185-
}
186-
187191
func (r *resourceTFEHYOKConfiguration) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
188192
resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp)
189193
}
@@ -204,46 +208,12 @@ func (r *resourceTFEHYOKConfiguration) Create(ctx context.Context, req resource.
204208
return
205209
}
206210

207-
var awsOIDCConfig *tfe.AWSOIDCConfiguration
208-
if plan.AWSOIDCConfigurationID.ValueString() != "" {
209-
awsOIDCConfig = &tfe.AWSOIDCConfiguration{ID: plan.AWSOIDCConfigurationID.ValueString()}
210-
}
211-
212-
var gcpOIDCConfig *tfe.GCPOIDCConfiguration
213-
if plan.GCPOIDCConfigurationID.ValueString() != "" {
214-
gcpOIDCConfig = &tfe.GCPOIDCConfiguration{ID: plan.GCPOIDCConfigurationID.ValueString()}
215-
}
216-
217-
var vaultOIDCConfig *tfe.VaultOIDCConfiguration
218-
if plan.VaultOIDCConfigurationID.ValueString() != "" {
219-
vaultOIDCConfig = &tfe.VaultOIDCConfiguration{ID: plan.VaultOIDCConfigurationID.ValueString()}
220-
}
221-
222-
var azureOIDCConfig *tfe.AzureOIDCConfiguration
223-
if plan.AzureOIDCConfigurationID.ValueString() != "" {
224-
azureOIDCConfig = &tfe.AzureOIDCConfiguration{ID: plan.AzureOIDCConfigurationID.ValueString()}
225-
}
226-
227-
var kmsOptions *tfe.KMSOptions
228-
if plan.KMSOptions != nil {
229-
kmsOptions = &tfe.KMSOptions{
230-
KeyRegion: plan.KMSOptions.KeyRegion.ValueString(),
231-
KeyLocation: plan.KMSOptions.KeyLocation.ValueString(),
232-
KeyRingID: plan.KMSOptions.KeyRingID.ValueString(),
233-
}
234-
}
235-
236211
options := tfe.HYOKConfigurationsCreateOptions{
237-
KEKID: plan.KEKID.ValueString(),
238-
Name: plan.Name.ValueString(),
239-
KMSOptions: kmsOptions,
240-
OIDCConfiguration: &tfe.OIDCConfigurationTypeChoice{
241-
AWSOIDCConfiguration: awsOIDCConfig,
242-
GCPOIDCConfiguration: gcpOIDCConfig,
243-
VaultOIDCConfiguration: vaultOIDCConfig,
244-
AzureOIDCConfiguration: azureOIDCConfig,
245-
},
246-
AgentPool: &tfe.AgentPool{ID: plan.AgentPoolID.ValueString()},
212+
KEKID: plan.KEKID.ValueString(),
213+
Name: plan.Name.ValueString(),
214+
KMSOptions: plan.KMSOptions.TFEKMSOptions(),
215+
OIDCConfiguration: plan.TFEOIDCConfigurationTypeChoice(),
216+
AgentPool: &tfe.AgentPool{ID: plan.AgentPoolID.ValueString()},
247217
}
248218

249219
tflog.Debug(ctx, fmt.Sprintf("Create TFE HYOK Configuration for organization %s", orgName))
@@ -300,19 +270,10 @@ func (r *resourceTFEHYOKConfiguration) Update(ctx context.Context, req resource.
300270
return
301271
}
302272

303-
var kmsOptions *tfe.KMSOptions
304-
if plan.KMSOptions != nil {
305-
kmsOptions = &tfe.KMSOptions{
306-
KeyRegion: plan.KMSOptions.KeyRegion.ValueString(),
307-
KeyLocation: plan.KMSOptions.KeyLocation.ValueString(),
308-
KeyRingID: plan.KMSOptions.KeyRingID.ValueString(),
309-
}
310-
}
311-
312273
options := tfe.HYOKConfigurationsUpdateOptions{
313274
Name: plan.Name.ValueStringPointer(),
314275
KEKID: plan.KEKID.ValueStringPointer(),
315-
KMSOptions: kmsOptions,
276+
KMSOptions: plan.KMSOptions.TFEKMSOptions(),
316277
AgentPool: &tfe.AgentPool{ID: plan.AgentPoolID.ValueString()},
317278
}
318279

@@ -342,6 +303,7 @@ func (r *resourceTFEHYOKConfiguration) Delete(ctx context.Context, req resource.
342303
if err != nil {
343304
if errors.Is(err, tfe.ErrResourceNotFound) {
344305
tflog.Debug(ctx, fmt.Sprintf("TFE HYOK configuration %s no longer exists", hyokID))
306+
return
345307
}
346308

347309
resp.Diagnostics.AddError("Error deleting TFE HYOK Configuration", err.Error())
@@ -369,13 +331,17 @@ func modelFromTFEHYOKConfiguration(p *tfe.HYOKConfiguration) modelTFEHYOKConfigu
369331
}
370332

371333
if p.OIDCConfiguration.AWSOIDCConfiguration != nil {
372-
model.AWSOIDCConfigurationID = types.StringValue(p.OIDCConfiguration.AWSOIDCConfiguration.ID)
334+
model.OIDCConfigurationID = types.StringValue(p.OIDCConfiguration.AWSOIDCConfiguration.ID)
335+
model.OIDCConfigurationType = types.StringValue(OIDCConfigurationTypeAWS)
373336
} else if p.OIDCConfiguration.GCPOIDCConfiguration != nil {
374-
model.GCPOIDCConfigurationID = types.StringValue(p.OIDCConfiguration.GCPOIDCConfiguration.ID)
337+
model.OIDCConfigurationID = types.StringValue(p.OIDCConfiguration.GCPOIDCConfiguration.ID)
338+
model.OIDCConfigurationType = types.StringValue(OIDCConfigurationTypeGCP)
375339
} else if p.OIDCConfiguration.AzureOIDCConfiguration != nil {
376-
model.AzureOIDCConfigurationID = types.StringValue(p.OIDCConfiguration.AzureOIDCConfiguration.ID)
340+
model.OIDCConfigurationID = types.StringValue(p.OIDCConfiguration.AzureOIDCConfiguration.ID)
341+
model.OIDCConfigurationType = types.StringValue(OIDCConfigurationTypeAzure)
377342
} else if p.OIDCConfiguration.VaultOIDCConfiguration != nil {
378-
model.VaultOIDCConfigurationID = types.StringValue(p.OIDCConfiguration.VaultOIDCConfiguration.ID)
343+
model.OIDCConfigurationID = types.StringValue(p.OIDCConfiguration.VaultOIDCConfiguration.ID)
344+
model.OIDCConfigurationType = types.StringValue(OIDCConfigurationTypeVault)
379345
}
380346

381347
return model

‎internal/provider/resource_tfe_hyok_configuration_test.go‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
3030
Check: resource.ComposeAggregateTestCheckFunc(
3131
testAccCheckTFEHYOKConfigurationExists("tfe_hyok_configuration.hyok", state),
3232
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "id"),
33-
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "aws_oidc_configuration_id"),
3433
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "name", "apple"),
34+
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "oidc_configuration_id"),
35+
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "oidc_configuration_type", "aws"),
3536
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "kek_id", "arn:aws:kms:us-east-1:123456789012:key/key1"),
3637
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "kms_options.key_region", "us-east-1"),
3738
),
@@ -47,8 +48,9 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
4748
Config: testAccTFEAWSHYOKConfigurationConfig(orgName, "orange", "arn:aws:kms:us-east-1:123456789012:key/key2", "us-east-2"),
4849
Check: resource.ComposeAggregateTestCheckFunc(
4950
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "id"),
50-
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "aws_oidc_configuration_id"),
5151
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "name", "orange"),
52+
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "oidc_configuration_id"),
53+
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "oidc_configuration_type", "aws"),
5254
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "kek_id", "arn:aws:kms:us-east-1:123456789012:key/key2"),
5355
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "kms_options.key_region", "us-east-2"),
5456
),
@@ -71,8 +73,9 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
7173
Check: resource.ComposeAggregateTestCheckFunc(
7274
testAccCheckTFEHYOKConfigurationExists("tfe_hyok_configuration.hyok", state),
7375
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "id"),
74-
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "vault_oidc_configuration_id"),
7576
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "name", "peach"),
77+
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "oidc_configuration_id"),
78+
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "oidc_configuration_type", "vault"),
7679
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "kek_id", "key1"),
7780
),
7881
},
@@ -87,8 +90,9 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
8790
Config: testAccTFEVaultHYOKConfigurationConfig(orgName, "strawberry", "key2"),
8891
Check: resource.ComposeAggregateTestCheckFunc(
8992
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "id"),
90-
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "vault_oidc_configuration_id"),
9193
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "name", "strawberry"),
94+
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "oidc_configuration_id"),
95+
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "oidc_configuration_type", "vault"),
9296
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "kek_id", "key2"),
9397
),
9498
},
@@ -110,8 +114,9 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
110114
Check: resource.ComposeAggregateTestCheckFunc(
111115
testAccCheckTFEHYOKConfigurationExists("tfe_hyok_configuration.hyok", state),
112116
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "id"),
113-
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "gcp_oidc_configuration_id"),
114117
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "name", "cucumber"),
118+
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "oidc_configuration_id"),
119+
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "oidc_configuration_type", "gcp"),
115120
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "kek_id", "key1"),
116121
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "kms_options.key_location", "global"),
117122
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "kms_options.key_ring_id", "key-ring-1"),
@@ -129,8 +134,9 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
129134
Check: resource.ComposeAggregateTestCheckFunc(
130135
testAccCheckTFEHYOKConfigurationExists("tfe_hyok_configuration.hyok", state),
131136
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "id"),
132-
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "gcp_oidc_configuration_id"),
133137
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "name", "tomato"),
138+
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "oidc_configuration_id"),
139+
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "oidc_configuration_type", "gcp"),
134140
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "kek_id", "key2"),
135141
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "kms_options.key_location", "global"),
136142
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "kms_options.key_ring_id", "key-ring-2"),
@@ -154,8 +160,9 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
154160
Check: resource.ComposeAggregateTestCheckFunc(
155161
testAccCheckTFEHYOKConfigurationExists("tfe_hyok_configuration.hyok", state),
156162
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "id"),
157-
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "azure_oidc_configuration_id"),
158163
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "name", "banana"),
164+
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "oidc_configuration_id"),
165+
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "oidc_configuration_type", "azure"),
159166
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "kek_id", "https://random.vault.azure.net/keys/key1"),
160167
),
161168
},
@@ -170,8 +177,10 @@ func TestAccTFEHYOKConfiguration_basic(t *testing.T) {
170177
Config: testAccTFEAzureHYOKConfigurationConfig(orgName, "blueberry", "https://random.vault.azure.net/keys/key2"),
171178
Check: resource.ComposeAggregateTestCheckFunc(
172179
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "id"),
173-
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "azure_oidc_configuration_id"),
174180
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "name", "blueberry"),
181+
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "oidc_configuration_id"),
182+
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "oidc_configuration_type", "azure"),
183+
resource.TestCheckResourceAttrSet("tfe_hyok_configuration.hyok", "oidc_configuration_id"),
175184
resource.TestCheckResourceAttr("tfe_hyok_configuration.hyok", "kek_id", "https://random.vault.azure.net/keys/key2"),
176185
),
177186
},
@@ -243,7 +252,8 @@ resource "tfe_hyok_configuration" "hyok" {
243252
name = "%s"
244253
kek_id = "%s"
245254
agent_pool_id = resource.tfe_agent_pool.pool.id
246-
aws_oidc_configuration_id = resource.tfe_aws_oidc_configuration.aws_oidc_config.id
255+
oidc_configuration_id = resource.tfe_aws_oidc_configuration.aws_oidc_config.id
256+
oidc_configuration_type = "aws"
247257
kms_options {
248258
key_region = "%s"
249259
}
@@ -270,7 +280,8 @@ resource "tfe_hyok_configuration" "hyok" {
270280
name = "%s"
271281
kek_id = "%s"
272282
agent_pool_id = resource.tfe_agent_pool.pool.id
273-
vault_oidc_configuration_id = resource.tfe_vault_oidc_configuration.vault_oidc_config.id
283+
oidc_configuration_id = resource.tfe_vault_oidc_configuration.vault_oidc_config.id
284+
oidc_configuration_type = "vault"
274285
}
275286
`, orgName, orgName, orgName, name, kekID)
276287
}
@@ -294,7 +305,8 @@ resource "tfe_hyok_configuration" "hyok" {
294305
name = "%s"
295306
kek_id = "%s"
296307
agent_pool_id = resource.tfe_agent_pool.pool.id
297-
gcp_oidc_configuration_id = resource.tfe_gcp_oidc_configuration.gcp_oidc_config.id
308+
oidc_configuration_id = resource.tfe_gcp_oidc_configuration.gcp_oidc_config.id
309+
oidc_configuration_type = "gcp"
298310
kms_options {
299311
key_location = "%s"
300312
key_ring_id = "%s"
@@ -322,7 +334,8 @@ resource "tfe_hyok_configuration" "hyok" {
322334
name = "%s"
323335
kek_id = "%s"
324336
agent_pool_id = resource.tfe_agent_pool.pool.id
325-
azure_oidc_configuration_id = resource.tfe_azure_oidc_configuration.azure_oidc_config.id
337+
oidc_configuration_id = resource.tfe_azure_oidc_configuration.azure_oidc_config.id
338+
oidc_configuration_type = "azure"
326339
}
327340
`, orgName, orgName, orgName, name, kekID)
328341
}

0 commit comments

Comments
 (0)