fix lint

Author: wasaga

internal/provider/convert.go

@@ -90,7 +90,7 @@ func ToStringSlice(ctx context.Context, dst *[]string, list types.List, diagnost
 }
 
 // ToDuration converts a types.String containing a duration to a durationpb.Duration and handles diagnostics internally
-func ToDuration(dst **durationpb.Duration, src timetypes.GoDuration, field string, diagnostics *diag.Diagnostics) {
+func ToDuration(dst **durationpb.Duration, src timetypes.GoDuration, diagnostics *diag.Diagnostics) {
 	if src.IsNull() {
 		*dst = nil
 		return

internal/provider/route_model.go

@@ -72,8 +72,8 @@ func ConvertRouteToPB(
 	pbRoute.HostPathRegexRewritePattern = src.HostPathRegexRewritePattern.ValueStringPointer()
 	pbRoute.HostPathRegexRewriteSubstitution = src.HostPathRegexRewriteSubstitution.ValueStringPointer()
 	pbRoute.RegexPriorityOrder = src.RegexPriorityOrder.ValueInt64Pointer()
-	ToDuration(&pbRoute.Timeout, src.Timeout, "timeout", &diagnostics)
-	ToDuration(&pbRoute.IdleTimeout, src.IdleTimeout, "idle_timeout", &diagnostics)
+	ToDuration(&pbRoute.Timeout, src.Timeout, &diagnostics)
+	ToDuration(&pbRoute.IdleTimeout, src.IdleTimeout, &diagnostics)
 	pbRoute.AllowWebsockets = src.AllowWebsockets.ValueBoolPointer()
 	pbRoute.AllowSpdy = src.AllowSPDY.ValueBoolPointer()
 	pbRoute.TlsSkipVerify = src.TLSSkipVerify.ValueBoolPointer()

internal/provider/settings_model.go

@@ -113,7 +113,7 @@ func ConvertSettingsToPB(
 	pbSettings.ClientCaFile = src.ClientCAFile.ValueStringPointer()
 	pbSettings.ClientCaKeyPairId = src.ClientCAKeyPairID.ValueStringPointer()
 	pbSettings.CookieDomain = src.CookieDomain.ValueStringPointer()
-	ToDuration(&pbSettings.CookieExpire, src.CookieExpire, "cookie_expire", &diagnostics)
+	ToDuration(&pbSettings.CookieExpire, src.CookieExpire, &diagnostics)
 	pbSettings.CookieHttpOnly = src.CookieHTTPOnly.ValueBoolPointer()
 	pbSettings.CookieName = src.CookieName.ValueStringPointer()
 	pbSettings.CookieSameSite = src.CookieSameSite.ValueStringPointer()
@@ -122,7 +122,7 @@ func ConvertSettingsToPB(
 	pbSettings.DarkmodePrimaryColor = src.DarkmodePrimaryColor.ValueStringPointer()
 	pbSettings.DarkmodeSecondaryColor = src.DarkmodeSecondaryColor.ValueStringPointer()
 	pbSettings.DatabrokerServiceUrl = src.DatabrokerServiceURL.ValueStringPointer()
-	ToDuration(&pbSettings.DefaultUpstreamTimeout, src.DefaultUpstreamTimeout, "default_upstream_timeout", &diagnostics)
+	ToDuration(&pbSettings.DefaultUpstreamTimeout, src.DefaultUpstreamTimeout, &diagnostics)
 	pbSettings.DnsLookupFamily = src.DNSLookupFamily.ValueStringPointer()
 	pbSettings.ErrorMessageFirstParagraph = src.ErrorMessageFirstParagraph.ValueStringPointer()
 	pbSettings.FaviconUrl = src.FaviconURL.ValueStringPointer()
@@ -131,14 +131,14 @@ func ConvertSettingsToPB(
 	pbSettings.GrpcInsecure = src.GRPCInsecure.ValueBoolPointer()
 	pbSettings.HttpRedirectAddr = src.HTTPRedirectAddr.ValueStringPointer()
 	IdentityProviderSettingsToPB(ctx, pbSettings, src, &diagnostics)
-	ToDuration(&pbSettings.IdentityProviderRefreshInterval, src.IdentityProviderRefreshInterval, "identity_provider_refresh_interval", &diagnostics)
-	ToDuration(&pbSettings.IdentityProviderRefreshTimeout, src.IdentityProviderRefreshTimeout, "identity_provider_refresh_timeout", &diagnostics)
+	ToDuration(&pbSettings.IdentityProviderRefreshInterval, src.IdentityProviderRefreshInterval, &diagnostics)
+	ToDuration(&pbSettings.IdentityProviderRefreshTimeout, src.IdentityProviderRefreshTimeout, &diagnostics)
 	pbSettings.IdpClientId = src.IdpClientID.ValueStringPointer()
 	pbSettings.IdpClientSecret = src.IdpClientSecret.ValueStringPointer()
 	pbSettings.IdpProvider = src.IdpProvider.ValueStringPointer()
 	pbSettings.IdpProviderUrl = src.IdpProviderURL.ValueStringPointer()
-	ToDuration(&pbSettings.IdpRefreshDirectoryInterval, src.IdpRefreshDirectoryInterval, "idp_refresh_directory_interval", &diagnostics)
-	ToDuration(&pbSettings.IdpRefreshDirectoryTimeout, src.IdpRefreshDirectoryTimeout, "idp_refresh_directory_timeout", &diagnostics)
+	ToDuration(&pbSettings.IdpRefreshDirectoryInterval, src.IdpRefreshDirectoryInterval, &diagnostics)
+	ToDuration(&pbSettings.IdpRefreshDirectoryTimeout, src.IdpRefreshDirectoryTimeout, &diagnostics)
 	pbSettings.IdpServiceAccount = src.IdpServiceAccount.ValueStringPointer()
 	pbSettings.InsecureServer = src.InsecureServer.ValueBoolPointer()
 	pbSettings.InstallationId = src.InstallationID.ValueStringPointer()
@@ -154,9 +154,9 @@ func ConvertSettingsToPB(
 	pbSettings.SecondaryColor = src.SecondaryColor.ValueStringPointer()
 	ToStringMap(ctx, &pbSettings.SetResponseHeaders, src.SetResponseHeaders, &diagnostics)
 	pbSettings.SkipXffAppend = src.SkipXFFAppend.ValueBoolPointer()
-	ToDuration(&pbSettings.TimeoutIdle, src.TimeoutIdle, "timeout_idle", &diagnostics)
-	ToDuration(&pbSettings.TimeoutRead, src.TimeoutRead, "timeout_read", &diagnostics)
-	ToDuration(&pbSettings.TimeoutWrite, src.TimeoutWrite, "timeout_write", &diagnostics)
+	ToDuration(&pbSettings.TimeoutIdle, src.TimeoutIdle, &diagnostics)
+	ToDuration(&pbSettings.TimeoutRead, src.TimeoutRead, &diagnostics)
+	ToDuration(&pbSettings.TimeoutWrite, src.TimeoutWrite, &diagnostics)
 	pbSettings.TracingDatadogAddress = src.TracingDatadogAddress.ValueStringPointer()
 	pbSettings.TracingJaegerAgentEndpoint = src.TracingJaegerAgentEndpoint.ValueStringPointer()
 	pbSettings.TracingJaegerCollectorEndpoint = src.TracingJaegerCollectorEndpoint.ValueStringPointer()