Skip to content

Commit 49e6fd2

Browse files
wasagawasaga
committed
rm some unnecessary helpers, rm shared_secret and services fields
1 parent 0ffbe52 commit 49e6fd2

File tree

5 files changed

+54
-165
lines changed

5 files changed

+54
-165
lines changed

‎example/main.tf

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ resource "pomerium_namespace" "test_namespace" {
2121
}
2222

2323
resource "pomerium_settings" "settings" {
24+
installation_id = "localhost-dev"
2425
}
2526

2627
resource "pomerium_policy" "test_policy" {

‎internal/provider/convert.go

-27
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,6 @@ import (
1111
"google.golang.org/protobuf/types/known/durationpb"
1212
)
1313

14-
// StringP returns a pointer to the string value if not null, otherwise nil
15-
func StringP(v types.String) *string {
16-
if v.IsNull() {
17-
return nil
18-
}
19-
value := v.ValueString()
20-
return &value
21-
}
22-
23-
// BoolP returns a pointer to the bool value if not null, otherwise nil
24-
func BoolP(v types.Bool) *bool {
25-
if v.IsNull() {
26-
return nil
27-
}
28-
value := v.ValueBool()
29-
return &value
30-
}
31-
32-
// Float64P returns a pointer to the float64 value if not null, otherwise nil
33-
func Float64P(v types.Float64) *float64 {
34-
if v.IsNull() {
35-
return nil
36-
}
37-
value := v.ValueFloat64()
38-
return &value
39-
}
40-
4114
func FromStringSlice(slice []string) types.List {
4215
if slice == nil {
4316
return types.ListNull(types.StringType)

‎internal/provider/convert_test.go

-70
Original file line numberDiff line numberDiff line change
@@ -15,76 +15,6 @@ import (
1515
"google.golang.org/protobuf/types/known/durationpb"
1616
)
1717

18-
func TestStringP(t *testing.T) {
19-
tests := []struct {
20-
name string
21-
input types.String
22-
expected *string
23-
}{
24-
{
25-
name: "null string",
26-
input: types.StringNull(),
27-
expected: nil,
28-
},
29-
{
30-
name: "empty string",
31-
input: types.StringValue(""),
32-
expected: ptr(""),
33-
},
34-
{
35-
name: "normal string",
36-
input: types.StringValue("test"),
37-
expected: ptr("test"),
38-
},
39-
}
40-
41-
for _, tt := range tests {
42-
t.Run(tt.name, func(t *testing.T) {
43-
result := provider.StringP(tt.input)
44-
if tt.expected == nil {
45-
assert.Nil(t, result)
46-
} else {
47-
assert.Equal(t, *tt.expected, *result)
48-
}
49-
})
50-
}
51-
}
52-
53-
func TestBoolP(t *testing.T) {
54-
tests := []struct {
55-
name string
56-
input types.Bool
57-
expected *bool
58-
}{
59-
{
60-
name: "null bool",
61-
input: types.BoolNull(),
62-
expected: nil,
63-
},
64-
{
65-
name: "true value",
66-
input: types.BoolValue(true),
67-
expected: ptr(true),
68-
},
69-
{
70-
name: "false value",
71-
input: types.BoolValue(false),
72-
expected: ptr(false),
73-
},
74-
}
75-
76-
for _, tt := range tests {
77-
t.Run(tt.name, func(t *testing.T) {
78-
result := provider.BoolP(tt.input)
79-
if tt.expected == nil {
80-
assert.Nil(t, result)
81-
} else {
82-
assert.Equal(t, *tt.expected, *result)
83-
}
84-
})
85-
}
86-
}
87-
8818
func TestFromStringSlice(t *testing.T) {
8919
tests := []struct {
9020
name string

‎internal/provider/settings_model.go

+53-59
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,7 @@ type SettingsModel struct {
6767
RequestParams types.Map `tfsdk:"request_params"`
6868
Scopes types.List `tfsdk:"scopes"`
6969
SecondaryColor types.String `tfsdk:"secondary_color"`
70-
Services types.String `tfsdk:"services"`
7170
SetResponseHeaders types.Map `tfsdk:"set_response_headers"`
72-
SharedSecret types.String `tfsdk:"shared_secret"`
7371
SkipXFFAppend types.Bool `tfsdk:"skip_xff_append"`
7472
TimeoutIdle types.String `tfsdk:"timeout_idle"`
7573
TimeoutRead types.String `tfsdk:"timeout_read"`
@@ -90,75 +88,73 @@ func ConvertSettingsToPB(
9088
pbSettings := &pb.Settings{}
9189

9290
ToStringList(ctx, &pbSettings.AccessLogFields, src.AccessLogFields, &diagnostics)
93-
pbSettings.Address = StringP(src.Address)
94-
pbSettings.AuthenticateCallbackPath = StringP(src.AuthenticateCallbackPath)
95-
pbSettings.AuthenticateServiceUrl = StringP(src.AuthenticateServiceURL)
91+
pbSettings.Address = src.Address.ValueStringPointer()
92+
pbSettings.AuthenticateCallbackPath = src.AuthenticateCallbackPath.ValueStringPointer()
93+
pbSettings.AuthenticateServiceUrl = src.AuthenticateServiceURL.ValueStringPointer()
9694
ToStringList(ctx, &pbSettings.AuthorizeLogFields, src.AuthorizeLogFields, &diagnostics)
97-
pbSettings.AuthorizeServiceUrl = StringP(src.AuthorizeServiceURL)
98-
pbSettings.Autocert = BoolP(src.Autocert)
99-
pbSettings.AutocertDir = StringP(src.AutocertDir)
100-
pbSettings.AutocertMustStaple = BoolP(src.AutocertMustStaple)
101-
pbSettings.AutocertUseStaging = BoolP(src.AutocertUseStaging)
102-
pbSettings.CacheServiceUrl = StringP(src.CacheServiceURL)
103-
pbSettings.CertificateAuthority = StringP(src.CertificateAuthority)
104-
pbSettings.CertificateAuthorityFile = StringP(src.CertificateAuthorityFile)
105-
pbSettings.CertificateAuthorityKeyPairId = StringP(src.CertificateAuthorityKeyPairID)
106-
pbSettings.ClientCa = StringP(src.ClientCA)
107-
pbSettings.ClientCaFile = StringP(src.ClientCAFile)
108-
pbSettings.ClientCaKeyPairId = StringP(src.ClientCAKeyPairID)
109-
pbSettings.CookieDomain = StringP(src.CookieDomain)
95+
pbSettings.AuthorizeServiceUrl = src.AuthorizeServiceURL.ValueStringPointer()
96+
pbSettings.Autocert = src.Autocert.ValueBoolPointer()
97+
pbSettings.AutocertDir = src.AutocertDir.ValueStringPointer()
98+
pbSettings.AutocertMustStaple = src.AutocertMustStaple.ValueBoolPointer()
99+
pbSettings.AutocertUseStaging = src.AutocertUseStaging.ValueBoolPointer()
100+
pbSettings.CacheServiceUrl = src.CacheServiceURL.ValueStringPointer()
101+
pbSettings.CertificateAuthority = src.CertificateAuthority.ValueStringPointer()
102+
pbSettings.CertificateAuthorityFile = src.CertificateAuthorityFile.ValueStringPointer()
103+
pbSettings.CertificateAuthorityKeyPairId = src.CertificateAuthorityKeyPairID.ValueStringPointer()
104+
pbSettings.ClientCa = src.ClientCA.ValueStringPointer()
105+
pbSettings.ClientCaFile = src.ClientCAFile.ValueStringPointer()
106+
pbSettings.ClientCaKeyPairId = src.ClientCAKeyPairID.ValueStringPointer()
107+
pbSettings.CookieDomain = src.CookieDomain.ValueStringPointer()
110108
ToDuration(&pbSettings.CookieExpire, src.CookieExpire, "cookie_expire", &diagnostics)
111-
pbSettings.CookieHttpOnly = BoolP(src.CookieHTTPOnly)
112-
pbSettings.CookieName = StringP(src.CookieName)
113-
pbSettings.CookieSameSite = StringP(src.CookieSameSite)
114-
pbSettings.CookieSecret = StringP(src.CookieSecret)
115-
pbSettings.CookieSecure = BoolP(src.CookieSecure)
116-
pbSettings.DarkmodePrimaryColor = StringP(src.DarkmodePrimaryColor)
117-
pbSettings.DarkmodeSecondaryColor = StringP(src.DarkmodeSecondaryColor)
118-
pbSettings.DatabrokerServiceUrl = StringP(src.DatabrokerServiceURL)
109+
pbSettings.CookieHttpOnly = src.CookieHTTPOnly.ValueBoolPointer()
110+
pbSettings.CookieName = src.CookieName.ValueStringPointer()
111+
pbSettings.CookieSameSite = src.CookieSameSite.ValueStringPointer()
112+
pbSettings.CookieSecret = src.CookieSecret.ValueStringPointer()
113+
pbSettings.CookieSecure = src.CookieSecure.ValueBoolPointer()
114+
pbSettings.DarkmodePrimaryColor = src.DarkmodePrimaryColor.ValueStringPointer()
115+
pbSettings.DarkmodeSecondaryColor = src.DarkmodeSecondaryColor.ValueStringPointer()
116+
pbSettings.DatabrokerServiceUrl = src.DatabrokerServiceURL.ValueStringPointer()
119117
ToDuration(&pbSettings.DefaultUpstreamTimeout, src.DefaultUpstreamTimeout, "default_upstream_timeout", &diagnostics)
120-
pbSettings.DnsLookupFamily = StringP(src.DNSLookupFamily)
121-
pbSettings.ErrorMessageFirstParagraph = StringP(src.ErrorMessageFirstParagraph)
122-
pbSettings.FaviconUrl = StringP(src.FaviconURL)
123-
pbSettings.GoogleCloudServerlessAuthenticationServiceAccount = StringP(src.GoogleCloudServerlessAuthenticationServiceAccount)
124-
pbSettings.GrpcAddress = StringP(src.GRPCAddress)
125-
pbSettings.GrpcInsecure = BoolP(src.GRPCInsecure)
126-
pbSettings.HttpRedirectAddr = StringP(src.HTTPRedirectAddr)
127-
pbSettings.IdentityProvider = StringP(src.IdentityProvider)
118+
pbSettings.DnsLookupFamily = src.DNSLookupFamily.ValueStringPointer()
119+
pbSettings.ErrorMessageFirstParagraph = src.ErrorMessageFirstParagraph.ValueStringPointer()
120+
pbSettings.FaviconUrl = src.FaviconURL.ValueStringPointer()
121+
pbSettings.GoogleCloudServerlessAuthenticationServiceAccount = src.GoogleCloudServerlessAuthenticationServiceAccount.ValueStringPointer()
122+
pbSettings.GrpcAddress = src.GRPCAddress.ValueStringPointer()
123+
pbSettings.GrpcInsecure = src.GRPCInsecure.ValueBoolPointer()
124+
pbSettings.HttpRedirectAddr = src.HTTPRedirectAddr.ValueStringPointer()
125+
pbSettings.IdentityProvider = src.IdentityProvider.ValueStringPointer()
128126
ToDuration(&pbSettings.IdentityProviderRefreshInterval, src.IdentityProviderRefreshInterval, "identity_provider_refresh_interval", &diagnostics)
129127
ToDuration(&pbSettings.IdentityProviderRefreshTimeout, src.IdentityProviderRefreshTimeout, "identity_provider_refresh_timeout", &diagnostics)
130-
pbSettings.IdpClientId = StringP(src.IdpClientID)
131-
pbSettings.IdpClientSecret = StringP(src.IdpClientSecret)
132-
pbSettings.IdpProvider = StringP(src.IdpProvider)
133-
pbSettings.IdpProviderUrl = StringP(src.IdpProviderURL)
128+
pbSettings.IdpClientId = src.IdpClientID.ValueStringPointer()
129+
pbSettings.IdpClientSecret = src.IdpClientSecret.ValueStringPointer()
130+
pbSettings.IdpProvider = src.IdpProvider.ValueStringPointer()
131+
pbSettings.IdpProviderUrl = src.IdpProviderURL.ValueStringPointer()
134132
ToDuration(&pbSettings.IdpRefreshDirectoryInterval, src.IdpRefreshDirectoryInterval, "idp_refresh_directory_interval", &diagnostics)
135133
ToDuration(&pbSettings.IdpRefreshDirectoryTimeout, src.IdpRefreshDirectoryTimeout, "idp_refresh_directory_timeout", &diagnostics)
136-
pbSettings.IdpServiceAccount = StringP(src.IdpServiceAccount)
137-
pbSettings.InsecureServer = BoolP(src.InsecureServer)
138-
pbSettings.InstallationId = StringP(src.InstallationID)
134+
pbSettings.IdpServiceAccount = src.IdpServiceAccount.ValueStringPointer()
135+
pbSettings.InsecureServer = src.InsecureServer.ValueBoolPointer()
136+
pbSettings.InstallationId = src.InstallationID.ValueStringPointer()
139137
ToStringMap(ctx, &pbSettings.JwtClaimsHeaders, src.JWTClaimsHeaders, &diagnostics)
140-
pbSettings.LogLevel = StringP(src.LogLevel)
141-
pbSettings.LogoUrl = StringP(src.LogoURL)
142-
pbSettings.MetricsAddress = StringP(src.MetricsAddress)
143-
pbSettings.PassIdentityHeaders = BoolP(src.PassIdentityHeaders)
144-
pbSettings.PrimaryColor = StringP(src.PrimaryColor)
145-
pbSettings.ProxyLogLevel = StringP(src.ProxyLogLevel)
138+
pbSettings.LogLevel = src.LogLevel.ValueStringPointer()
139+
pbSettings.LogoUrl = src.LogoURL.ValueStringPointer()
140+
pbSettings.MetricsAddress = src.MetricsAddress.ValueStringPointer()
141+
pbSettings.PassIdentityHeaders = src.PassIdentityHeaders.ValueBoolPointer()
142+
pbSettings.PrimaryColor = src.PrimaryColor.ValueStringPointer()
143+
pbSettings.ProxyLogLevel = src.ProxyLogLevel.ValueStringPointer()
146144
ToStringMap(ctx, &pbSettings.RequestParams, src.RequestParams, &diagnostics)
147145
ToStringSlice(ctx, &pbSettings.Scopes, src.Scopes, &diagnostics)
148-
pbSettings.SecondaryColor = StringP(src.SecondaryColor)
149-
pbSettings.Services = StringP(src.Services)
146+
pbSettings.SecondaryColor = src.SecondaryColor.ValueStringPointer()
150147
ToStringMap(ctx, &pbSettings.SetResponseHeaders, src.SetResponseHeaders, &diagnostics)
151-
pbSettings.SharedSecret = StringP(src.SharedSecret)
152-
pbSettings.SkipXffAppend = BoolP(src.SkipXFFAppend)
148+
pbSettings.SkipXffAppend = src.SkipXFFAppend.ValueBoolPointer()
153149
ToDuration(&pbSettings.TimeoutIdle, src.TimeoutIdle, "timeout_idle", &diagnostics)
154150
ToDuration(&pbSettings.TimeoutRead, src.TimeoutRead, "timeout_read", &diagnostics)
155151
ToDuration(&pbSettings.TimeoutWrite, src.TimeoutWrite, "timeout_write", &diagnostics)
156-
pbSettings.TracingDatadogAddress = StringP(src.TracingDatadogAddress)
157-
pbSettings.TracingJaegerAgentEndpoint = StringP(src.TracingJaegerAgentEndpoint)
158-
pbSettings.TracingJaegerCollectorEndpoint = StringP(src.TracingJaegerCollectorEndpoint)
159-
pbSettings.TracingProvider = StringP(src.TracingProvider)
160-
pbSettings.TracingSampleRate = Float64P(src.TracingSampleRate)
161-
pbSettings.TracingZipkinEndpoint = StringP(src.TracingZipkinEndpoint)
152+
pbSettings.TracingDatadogAddress = src.TracingDatadogAddress.ValueStringPointer()
153+
pbSettings.TracingJaegerAgentEndpoint = src.TracingJaegerAgentEndpoint.ValueStringPointer()
154+
pbSettings.TracingJaegerCollectorEndpoint = src.TracingJaegerCollectorEndpoint.ValueStringPointer()
155+
pbSettings.TracingProvider = src.TracingProvider.ValueStringPointer()
156+
pbSettings.TracingSampleRate = src.TracingSampleRate.ValueFloat64Pointer()
157+
pbSettings.TracingZipkinEndpoint = src.TracingZipkinEndpoint.ValueStringPointer()
162158

163159
return pbSettings, diagnostics
164160
}
@@ -226,9 +222,7 @@ func ConvertSettingsFromPB(
226222
dst.RequestParams = FromStringMap(src.RequestParams)
227223
dst.Scopes = FromStringSlice(src.Scopes)
228224
dst.SecondaryColor = types.StringPointerValue(src.SecondaryColor)
229-
dst.Services = types.StringPointerValue(src.Services)
230225
dst.SetResponseHeaders = FromStringMap(src.SetResponseHeaders)
231-
dst.SharedSecret = types.StringPointerValue(src.SharedSecret)
232226
dst.SkipXFFAppend = types.BoolPointerValue(src.SkipXffAppend)
233227
dst.TimeoutIdle = FromDuration(src.TimeoutIdle)
234228
dst.TimeoutRead = FromDuration(src.TimeoutRead)

‎internal/provider/settings_schema.go

-9
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,6 @@ var SettingsResourceSchema = schema.Schema{
2626
Optional: true,
2727
Description: "Proxy log level",
2828
},
29-
"shared_secret": schema.StringAttribute{
30-
Optional: true,
31-
Description: "Shared secret",
32-
Sensitive: true,
33-
},
34-
"services": schema.StringAttribute{
35-
Optional: true,
36-
Description: "Services",
37-
},
3829
"address": schema.StringAttribute{
3930
Optional: true,
4031
Description: "Address",

0 commit comments

Comments
 (0)