Skip to content

fix(controller): panic in OCI provider build #5877

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
merged 1 commit into from
Oct 19, 2025
+24 −7
Merged

fix(controller): panic in OCI provider build #5877

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
14 changes: 7 additions & 7 deletions controller/execute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,17 +278,17 @@ func buildProvider(
if cfg.OCIAuthInstancePrincipal {
if len(cfg.OCICompartmentOCID) == 0 {
err = fmt.Errorf("instance principal authentication requested, but no compartment OCID provided")
} else {
authConfig := oci.OCIAuthConfig{UseInstancePrincipal: true}
config = &oci.OCIConfig{Auth: authConfig, CompartmentID: cfg.OCICompartmentOCID}
break
}
authConfig := oci.OCIAuthConfig{UseInstancePrincipal: true}
config = &oci.OCIConfig{Auth: authConfig, CompartmentID: cfg.OCICompartmentOCID}
} else {
config, err = oci.LoadOCIConfig(cfg.OCIConfigFile)
if config, err = oci.LoadOCIConfig(cfg.OCIConfigFile); err != nil {
break
}
}
config.ZoneCacheDuration = cfg.OCIZoneCacheDuration
if err == nil {
Copy link
Contributor

@jrosinsk jrosinsk Oct 5, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the panic happens on the access to the non-existant ZoneCacheDuration.
another way to fix this would be to just protect that call when there is no config loaded:

`

         if err == nil {
                    config.ZoneCacheDuration = cfg.OCIZoneCacheDuration
                    p, err = oci.NewOCIProvider(*config, domainFilter, zoneIDFilter, cfg.OCIZoneScope, cfg.DryRun)
            }
    case "rfc2136":

`

Seems a bit more confusing with the break statements.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tend to agree.

A different way would be to move the nil check to the method you are calling. In Go you can do this 😊

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the panic happens on the access to the non-existant ZoneCacheDuration. another way to fix this would be to just protect that call when there is no config loaded:

`

         if err == nil {
                    config.ZoneCacheDuration = cfg.OCIZoneCacheDuration
                    p, err = oci.NewOCIProvider(*config, domainFilter, zoneIDFilter, cfg.OCIZoneScope, cfg.DryRun)
            }
    case "rfc2136":

`

Seems a bit more confusing with the break statements.

That was my initial PR 665180f

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vflaux It looked less confusing to me with the break statement 😅 but, anyway, feel free to revert this point.

p, err = oci.NewOCIProvider(*config, domainFilter, zoneIDFilter, cfg.OCIZoneScope, cfg.DryRun)
}
p, err = oci.NewOCIProvider(*config, domainFilter, zoneIDFilter, cfg.OCIZoneScope, cfg.DryRun)
case "rfc2136":
tlsConfig := rfc2136.TLSConfig{
UseTLS: cfg.RFC2136UseTLS,
Expand Down
17 changes: 17 additions & 0 deletions controller/execute_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,23 @@ func TestBuildProvider(t *testing.T) {
},
expectedType: "*provider.CachedProvider",
},
{
name: "oci provider instance principal without compartment OCID",
cfg: &externaldns.Config{
Provider: "oci",
OCIAuthInstancePrincipal: true,
OCICompartmentOCID: "",
},
expectedError: "instance principal authentication requested, but no compartment OCID provided",
},
{
name: "oci provider without config file",
cfg: &externaldns.Config{
Provider: "oci",
OCIConfigFile: "",
},
expectedError: "reading OCI config file",
},
{
name: "coredns provider",
cfg: &externaldns.Config{
Expand Down
Loading