Skip to content

refactor: Remove api module dependency from common module #1019

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
Jan 23, 2025
Merged

refactor: Remove api module dependency from common module #1019

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
2 changes: 1 addition & 1 deletion api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/ap

go 1.22.0

toolchain go1.23.3
toolchain go1.23.5

replace github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common => ../common

Expand Down
8 changes: 1 addition & 7 deletions common/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,11 @@ module github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/co

go 1.22.0

toolchain go1.23.3

replace github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api => ../api
toolchain go1.23.5

require (
github.com/evanphx/json-patch/v5 v5.9.0
github.com/go-logr/logr v1.4.2
github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api v0.0.0-00010101000000-000000000000
github.com/onsi/ginkgo/v2 v2.22.0
github.com/onsi/gomega v1.36.0
github.com/samber/lo v1.47.0
Expand All @@ -31,7 +28,6 @@ require (
require (
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/aws/aws-sdk-go v1.55.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
Expand All @@ -52,15 +48,13 @@ require (
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nutanix-cloud-native/prism-go-client v0.5.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.18.0 // indirect
Expand Down
8 changes: 0 additions & 8 deletions common/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM=
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
Expand Down Expand Up @@ -72,10 +70,6 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rH
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
Expand All @@ -97,8 +91,6 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/nutanix-cloud-native/prism-go-client v0.5.1 h1:ykiXPCILzEMORHz7XvI8KXNomChsdLIpOAlT/YqBCmo=
github.com/nutanix-cloud-native/prism-go-client v0.5.1/go.mod h1:QhLX+sEep0cStzHVYU6mPgIlnA8U3DySskagrbDprRk=
github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg=
github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
github.com/onsi/gomega v1.36.0 h1:Pb12RlruUtj4XUuPUqeEWc6j5DkVVVA49Uf6YLfC95Y=
Expand Down
27 changes: 0 additions & 27 deletions common/pkg/capi/apis/decoders.go
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions common/pkg/capi/apis/schemes.go
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions common/pkg/capi/apis/unstructured_fallback.go
View file
Open in desktop

This file was deleted.

160 changes: 0 additions & 160 deletions common/pkg/testutils/capitest/request/items.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ import (
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
capdv1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1"

capxv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1"
capav1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/serializer"
)

Expand Down Expand Up @@ -131,72 +129,6 @@ func NewKubeadmControlPlaneTemplateRequestItem(
return NewKubeadmControlPlaneTemplateRequest(uid, kubeadmControlPlaneTemplateRequestObjectName)
}

func NewAWSClusterTemplateRequestItem(
uid types.UID,
existingSpec ...capav1.AWSClusterTemplateSpec,
) runtimehooksv1.GeneratePatchesRequestItem {
awsClusterTemplate := &capav1.AWSClusterTemplate{
TypeMeta: metav1.TypeMeta{
APIVersion: capav1.GroupVersion.String(),
Kind: "AWSClusterTemplate",
},
}

switch len(existingSpec) {
case 0:
// Do nothing.
case 1:
awsClusterTemplate.Spec = existingSpec[0]
default:
panic("can only take at most one existing spec")
}

return NewRequestItem(
awsClusterTemplate,
&runtimehooksv1.HolderReference{
APIVersion: clusterv1.GroupVersion.String(),
Kind: "Cluster",
FieldPath: "spec.infrastructureRef",
Name: ClusterName,
Namespace: Namespace,
},
uid,
)
}

func NewNutanixClusterTemplateRequestItem(
uid types.UID,
existingSpec ...capxv1.NutanixClusterTemplateSpec,
) runtimehooksv1.GeneratePatchesRequestItem {
nutanixClusterTemplate := &capxv1.NutanixClusterTemplate{
TypeMeta: metav1.TypeMeta{
APIVersion: capxv1.GroupVersion.String(),
Kind: "NutanixClusterTemplate",
},
}

switch len(existingSpec) {
case 0:
// Do nothing.
case 1:
nutanixClusterTemplate.Spec = existingSpec[0]
default:
panic("can only take at most one existing spec")
}

return NewRequestItem(
nutanixClusterTemplate,
&runtimehooksv1.HolderReference{
APIVersion: clusterv1.GroupVersion.String(),
Kind: "Cluster",
FieldPath: "spec.infrastructureRef",
Name: ClusterName,
Namespace: Namespace,
},
uid,
)
}

func NewCPDockerMachineTemplateRequestItem(
uid types.UID,
) runtimehooksv1.GeneratePatchesRequestItem {
Expand Down Expand Up @@ -242,95 +174,3 @@ func NewWorkerDockerMachineTemplateRequestItem(
uid,
)
}

func NewCPAWSMachineTemplateRequestItem(
uid types.UID,
) runtimehooksv1.GeneratePatchesRequestItem {
return NewRequestItem(
&capav1.AWSMachineTemplate{
TypeMeta: metav1.TypeMeta{
APIVersion: capav1.GroupVersion.String(),
Kind: "AWSMachineTemplate",
},
ObjectMeta: metav1.ObjectMeta{
Name: "aws-machine-template",
Namespace: "aws-cluster",
},
},
&runtimehooksv1.HolderReference{
APIVersion: controlplanev1.GroupVersion.String(),
Kind: "KubeadmControlPlane",
FieldPath: "spec.machineTemplate.infrastructureRef",
},
uid,
)
}

func NewWorkerAWSMachineTemplateRequestItem(
uid types.UID,
) runtimehooksv1.GeneratePatchesRequestItem {
return NewRequestItem(
&capav1.AWSMachineTemplate{
TypeMeta: metav1.TypeMeta{
APIVersion: capav1.GroupVersion.String(),
Kind: "AWSMachineTemplate",
},
ObjectMeta: metav1.ObjectMeta{
Name: "aws-machine-template",
Namespace: "aws-cluster",
},
},
&runtimehooksv1.HolderReference{
APIVersion: clusterv1.GroupVersion.String(),
Kind: "MachineDeployment",
FieldPath: "spec.template.spec.infrastructureRef",
},
uid,
)
}

func NewCPNutanixMachineTemplateRequestItem(
uid types.UID,
) runtimehooksv1.GeneratePatchesRequestItem {
return NewRequestItem(
&capxv1.NutanixMachineTemplate{
TypeMeta: metav1.TypeMeta{
APIVersion: capxv1.GroupVersion.String(),
Kind: "NutanixMachineTemplate",
},
ObjectMeta: metav1.ObjectMeta{
Name: "nutanix-machine-template",
Namespace: "nutanix-cluster",
},
},
&runtimehooksv1.HolderReference{
APIVersion: controlplanev1.GroupVersion.String(),
Kind: "KubeadmControlPlane",
FieldPath: "spec.machineTemplate.infrastructureRef",
},
uid,
)
}

func NewWorkerNutanixMachineTemplateRequestItem(
uid types.UID,
) runtimehooksv1.GeneratePatchesRequestItem {
return NewRequestItem(
&capxv1.NutanixMachineTemplate{
TypeMeta: metav1.TypeMeta{
APIVersion: capxv1.GroupVersion.String(),
Kind: "NutanixMachineTemplate",
},
ObjectMeta: metav1.ObjectMeta{
Name: "nutanix-machine-template",
Namespace: "nutanix-cluster",
},
},
&runtimehooksv1.HolderReference{
APIVersion: clusterv1.GroupVersion.String(),
Kind: "MachineDeployment",
FieldPath: "spec.template.spec.infrastructureRef",
},
uid,
)
}
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix

go 1.23

toolchain go1.23.3
toolchain go1.23.5

replace (
github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api => ./api
Expand Down
Loading
Loading