Skip to content

Commit 36fb9a2

Browse files
committed
resource_federated_identity: migrate to plugin framework
Updates #37240 Also adds validation on custom claims Signed-off-by: Danni Popova <danni@tailscale.com>
1 parent 1231f54 commit 36fb9a2

5 files changed

Lines changed: 354 additions & 200 deletions

File tree

tailscale/provider_framework.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ func (p *tailscaleProvider) Resources(_ context.Context) []func() resource.Resou
160160
NewAWSExternalIDResource,
161161
NewDeviceKeyResource,
162162
NewDeviceSubnetRoutesResource,
163+
NewFederatedIdentityResource,
163164
}
164165
}
165166

tailscale/provider_sdk.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ func Provider(options ...ProviderOption) *schema.Provider {
108108
"tailscale_posture_integration": resourcePostureIntegration(),
109109
"tailscale_logstream_configuration": resourceLogstreamConfiguration(),
110110
"tailscale_tailnet_settings": resourceTailnetSettings(),
111-
"tailscale_federated_identity": resourceFederatedIdentity(),
112111
"tailscale_service": resourceService(),
113112
},
114113
DataSourcesMap: map[string]*schema.Resource{

tailscale/provider_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ func testProviderFactories(t *testing.T) map[string]func() (tfprotov5.ProviderSe
106106
ctx := context.Background()
107107

108108
t.Setenv("TAILSCALE_API_KEY", "api_123")
109+
t.Setenv("TAILSCALE_BASE_URL", testClient.BaseURL.String())
109110

110111
providers := []func() tfprotov5.ProviderServer{
111112
providerserver.NewProtocol5(NewFrameworkProvider()),

0 commit comments

Comments
 (0)