Skip to content

Commit

Permalink
Role: Do not set version if autoIncrementVersion is true (#139)
Browse files Browse the repository at this point in the history
In Terraform, the user would only set one of the two, but the Crossplane provider tries to set the value it reads back, preventing updates
  • Loading branch information
julienduchesne authored May 13, 2024
1 parent 40ef62a commit a414772
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 0 deletions.
3 changes: 3 additions & 0 deletions config/grafana/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,9 @@ func Configure(p *ujconfig.Provider) {
Extractor: optionalFieldExtractor("uid"),
}
})
p.AddResourceConfigurator("grafana_role", func(r *ujconfig.Resource) {
r.InitializerFns = append(r.InitializerFns, createroleInitializer)
})
p.AddResourceConfigurator("grafana_role_assignment", func(r *ujconfig.Resource) {
r.References["role_uid"] = ujconfig.Reference{
TerraformName: "grafana_role",
Expand Down
58 changes: 58 additions & 0 deletions config/grafana/initializer_role.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package grafana

import (
"context"
"encoding/json"
"fmt"

"github.com/crossplane/crossplane-runtime/pkg/fieldpath"
"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
"github.com/crossplane/crossplane-runtime/pkg/resource"
"sigs.k8s.io/controller-runtime/pkg/client"
)

func createroleInitializer(client client.Client) managed.Initializer {
return &roleInitializer{
kube: client,
}
}

// Based on the Tagger: https://github.com/crossplane/upjet/blob/v1.1.0/pkg/config/resource.go#L268
type roleInitializer struct {
kube client.Client
}

// If `autoIncrementVersion` is set to true, the `version` field will be set to the current value of `status.atProvider.version`.
// If the version field was never set, it will be deleted from the forProvider spec.
func (i *roleInitializer) Initialize(ctx context.Context, mg resource.Managed) error {
paved, err := fieldpath.PaveObject(mg)
if err != nil {
return err
}
v, err := paved.GetBool("spec.forProvider.autoIncrementVersion")
if err != nil {
return fmt.Errorf("could not get autoIncrementVersion: %w", err)
}
if !v {
return nil
}
atProviderValue, err := paved.GetValue("status.atProvider.version")
if err == nil {
if err := paved.SetValue("spec.forProvider.version", atProviderValue); err != nil {
return fmt.Errorf("could not set version: %w", err)
}
} else if err := paved.DeleteField("spec.forProvider.version"); err != nil {
return fmt.Errorf("could not delete version: %w", err)
}
pavedByte, err := paved.MarshalJSON()
if err != nil {
return fmt.Errorf("could not marshal modified role spec into JSON: %w", err)
}
if err := json.Unmarshal(pavedByte, mg); err != nil {
return fmt.Errorf("could not unmarshal modified role spec into managed resource interface: %w", err)
}
if err := i.kube.Update(ctx, mg); err != nil {
return fmt.Errorf("could not update managed resource: %w", err)
}
return nil
}
3 changes: 3 additions & 0 deletions internal/controller/enterprise/role/zz_controller.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a414772

Please sign in to comment.