Skip to content

fix: add tests and fix small issue with the SA URL passing #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ondbeh merged 1 commit into from
Dec 15, 2025
Merged

fix: add tests and fix small issue with the SA URL passing #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions internal/resolver/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@ func TestLoadConfig(t *testing.T) {
require.Equal(t, "auth-token", cfg.AuthTokenSecretKey)
require.Equal(t, int64(600), cfg.AcmeTxtRecordTTL)
})

t.Run("custom service account base url", func(t *testing.T) {
t.Parallel()

rawCfg := &v1.JSON{Raw: []byte(`{"projectId":"test", "authTokenSecretNamespace": "test", "serviceAccountBaseUrl": "https://custom.stackit.cloud/dns"}`)}
cfg, err := d.LoadConfig(rawCfg)
require.NoError(t, err)
require.Equal(t, "test", cfg.ProjectId)
require.Equal(t, "https://custom.stackit.cloud/dns", cfg.ServiceAccountBaseUrl)
})
}

func TestDefaultConfigProvider_LoadConfigNamespaceFile(t *testing.T) {
Expand Down Expand Up @@ -152,13 +162,15 @@ func TestGetRepositoryConfig_WithSaKeyPath(t *testing.T) {
}

cfg := &StackitDnsProviderConfig{
ApiBasePath: "https://api.stackit.cloud",
ProjectId: "test-project",
ApiBasePath: "https://api.stackit.cloud",
ProjectId: "test-project",
ServiceAccountBaseUrl: "https://sa-custom.stackit.cloud",
}

config, err := r.getRepositoryConfig(cfg)
require.NoError(t, err)
require.Equal(t, saKeyPath, config.SaKeyPath)
require.Equal(t, "https://sa-custom.stackit.cloud", config.ServiceAccountBaseUrl)
require.True(t, config.UseSaKey)
}

Expand Down
10 changes: 6 additions & 4 deletions internal/resolver/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,11 @@ func (s *stackitDnsProviderResolver) getRepositoryConfig(
cfg *StackitDnsProviderConfig,
) (repository.Config, error) {
config := repository.Config{
ApiBasePath: cfg.ApiBasePath,
ProjectId: cfg.ProjectId,
HttpClient: s.httpClient,
UseSaKey: false,
ApiBasePath: cfg.ApiBasePath,
ProjectId: cfg.ProjectId,
HttpClient: s.httpClient,
UseSaKey: false,
ServiceAccountBaseUrl: cfg.ServiceAccountBaseUrl,
}

switch {
Expand All @@ -253,6 +254,7 @@ func (s *stackitDnsProviderResolver) getRepositoryConfig(
s.logger.Info(
"Using service account key for authentication",
zap.String("saKeyPath", config.SaKeyPath),
zap.String("serviceAccountBaseUrl", config.ServiceAccountBaseUrl),
)
default:
authToken, err := s.getAuthToken(cfg)
Expand Down
Loading