Skip to content

Fix privatenetwork ref #31

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix privatenetwork ref #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
861d5ac
Terraform documentation scraper: update options
fabiencastarede Sep 12, 2025
7249346
Fix PrivateNetwork cross-reference for Subnet, SubnetV2, ProjectGatew…
fabiencastarede Sep 12, 2025
cd9d355
Fix linter failed checks
fabiencastarede Sep 15, 2025
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
2 changes: 1 addition & 1 deletion apis/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Copyright 2021 Upbound Inc.
//go:generate rm -rf ../examples-generated

// Generate documentation from Terraform docs.
//go:generate go run github.com/crossplane/upjet/cmd/scraper -n ${TERRAFORM_PROVIDER_SOURCE} -r ../.work/${TERRAFORM_PROVIDER_SOURCE}/${TERRAFORM_DOCS_PATH} -o ../config/provider-metadata.yaml
//go:generate go run github.com/crossplane/upjet/cmd/scraper -n ${TERRAFORM_PROVIDER_SOURCE} -r ../.work/${TERRAFORM_PROVIDER_SOURCE}/${TERRAFORM_DOCS_PATH} -o ../config/provider-metadata.yaml --prelude-xpath "//text()[(contains(., \"description\") and contains(., \"page_title\")) or contains(., \"subcategory\")]"

// Run Upjet generator
//go:generate go run ../cmd/generator/main.go ..
Expand Down
25 changes: 25 additions & 0 deletions config/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Inspired from https://github.com/crossplane-contrib/provider-upjet-aws/blob/main/config/cluster/common/common.go

package common

import (
"github.com/crossplane/crossplane-runtime/pkg/fieldpath"
"github.com/crossplane/crossplane-runtime/pkg/reference"
xpresource "github.com/crossplane/crossplane-runtime/pkg/resource"
)

func PrivateNetworkOpenStackIdExtractor() reference.ExtractValueFn {
return func(mg xpresource.Managed) string {
paved, err := fieldpath.PaveObject(mg)
if err != nil {
// todo(hasan): should we log this error?
return ""
}
r, err := paved.GetString("status.atProvider.regionsAttributes[0].openstackid")
if err != nil {
// todo(hasan): should we log this error?
return ""
}
return r
}
}
3 changes: 2 additions & 1 deletion config/gateway/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ func Configure(p *config.Provider) {
r.ShortGroup = shortGroup
r.Kind = "ProjectGateway"
r.References["network_id"] = config.Reference{
Type: "github.com/edixos/provider-ovh/apis/network/v1alpha1.PrivateNetwork",
Type: "github.com/edixos/provider-ovh/apis/network/v1alpha1.PrivateNetwork",
Extractor: "github.com/edixos/provider-ovh/config/common.PrivateNetworkOpenStackIdExtractor()",
}
r.References["subnet_id"] = config.Reference{
Type: "github.com/edixos/provider-ovh/apis/network/v1alpha1.Subnet",
Expand Down
6 changes: 5 additions & 1 deletion config/kube/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ func Configure(p *config.Provider) {
r.UseAsync = true
r.Kind = "Cluster"
r.References["private_network_id"] = config.Reference{
Type: "github.com/edixos/provider-ovh/apis/network/v1alpha1.PrivateNetwork",
Type: "github.com/edixos/provider-ovh/apis/network/v1alpha1.PrivateNetwork",
Extractor: "github.com/edixos/provider-ovh/config/common.PrivateNetworkOpenStackIdExtractor()",
}
r.References["nodes_subnet_id"] = config.Reference{
Type: "github.com/edixos/provider-ovh/apis/network/v1alpha1.Subnet",
}
})
p.AddResourceConfigurator("ovh_cloud_project_kube_iprestrictions", func(r *config.Resource) {
Expand Down
Loading