Skip to content

refactor: Move generic handlers into generic directory #171

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
Sep 21, 2023
Merged

refactor: Move generic handlers into generic directory #171

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
7 changes: 1 addition & 6 deletions api/v1alpha1/clusterconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,19 +215,14 @@ type CNI struct {
func (CNI) VariableSchema() clusterv1.VariableSchema {
supportedCNIProviders := []string{CNIProviderCalico}

cniProviderEnumVals, err := variables.ValuesToEnumJSON(supportedCNIProviders...)
if err != nil {
panic(err)
}

return clusterv1.VariableSchema{
OpenAPIV3Schema: clusterv1.JSONSchemaProps{
Type: "object",
Properties: map[string]clusterv1.JSONSchemaProps{
"provider": {
Description: "CNI provider to deploy",
Type: "string",
Enum: cniProviderEnumVals,
Enum: variables.MustMarshalValuesToEnumJSON(supportedCNIProviders...),
},
},
Required: []string{"provider"},
Expand Down
18 changes: 9 additions & 9 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ import (
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/server"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/auditpolicy"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/clusterconfig"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/cni/calico"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/etcd"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/extraapiservercertsans"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/httpproxy"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/kubernetesimagerepository"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/nfd"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/servicelbgc"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/lifecycle/cni/calico"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/lifecycle/nfd"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/lifecycle/servicelbgc"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/auditpolicy"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/etcd"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/extraapiservercertsans"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/httpproxy"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/kubernetesimagerepository"
)

// Flags.
Expand Down
13 changes: 3 additions & 10 deletions common/pkg/capi/clustertopology/variables/enums.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,15 @@
package variables

import (
"encoding/json"
"fmt"

apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
)

func ValuesToEnumJSON[T any](vals ...T) ([]apiextensionsv1.JSON, error) {
func MustMarshalValuesToEnumJSON[T any](vals ...T) []apiextensionsv1.JSON {
Copy link
Contributor

Choose a reason for hiding this comment

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

Good change

Copy link
Member Author

Choose a reason for hiding this comment

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

Thank you @dkoshkin, that means a lot 😉

Copy link
Contributor

Choose a reason for hiding this comment

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

😆

enumJSON := make([]apiextensionsv1.JSON, 0, len(vals))

for _, v := range vals {
enumVal, err := json.Marshal(v)
if err != nil {
return nil, fmt.Errorf("failed to marshal enum value: %v", v)
}
enumJSON = append(enumJSON, apiextensionsv1.JSON{Raw: enumVal})
enumJSON = append(enumJSON, *MustMarshal(v))
}

return enumJSON, nil
return enumJSON
}
3 changes: 1 addition & 2 deletions common/pkg/capi/clustertopology/variables/eums_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ func TestValuesToEnumJSON(t *testing.T) {
g := gomega.NewWithT(t)

// Call the function under test
jsonData, err := ValuesToEnumJSON(tt.input...)
g.Expect(err).NotTo(gomega.HaveOccurred())
jsonData := MustMarshalValuesToEnumJSON(tt.input...)

// Assert the result
g.Expect(jsonData).To(gomega.HaveLen(len(tt.expected)))
Expand Down
20 changes: 20 additions & 0 deletions common/pkg/capi/clustertopology/variables/json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright 2023 D2iQ, Inc. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

package variables

import (
"encoding/json"
"fmt"

apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
)

func MustMarshal(val any) *apiextensionsv1.JSON {
marshaled, err := json.Marshal(val)
if err != nil {
panic(fmt.Errorf("failed to marshal enum value: %w", err))
}

return &apiextensionsv1.JSON{Raw: marshaled}
}
0 pkg/handlers/clusterconfig/variables.go → ...ndlers/generic/clusterconfig/variables.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/clusterconfig/variables_test.go → ...s/generic/clusterconfig/variables_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/cni/calico/doc.go → ...dlers/generic/lifecycle/cni/calico/doc.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/handlers/cni/calico/handler.go → ...s/generic/lifecycle/cni/calico/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/k8s/client"
"github.com/d2iq-labs/capi-runtime-extensions/common/pkg/k8s/parser"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/cni"
"github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/lifecycle/cni"
)

const (
Expand Down
0 pkg/handlers/cni/cluster.go → ...handlers/generic/lifecycle/cni/cluster.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/cni/cluster_test.go → ...ers/generic/lifecycle/cni/cluster_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/cni/constants.go → ...ndlers/generic/lifecycle/cni/constants.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/nfd/handler.go → ...handlers/generic/lifecycle/nfd/handler.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/servicelbgc/deleter.go → .../generic/lifecycle/servicelbgc/deleter.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/servicelbgc/deleter_test.go → ...ric/lifecycle/servicelbgc/deleter_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/servicelbgc/doc.go → ...lers/generic/lifecycle/servicelbgc/doc.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/servicelbgc/handler.go → .../generic/lifecycle/servicelbgc/handler.go
View file
Open in desktop
File renamed without changes.
0 ...licy/embedded/apiserver-audit-policy.yaml → ...licy/embedded/apiserver-audit-policy.yaml
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/auditpolicy/inject.go → ...rs/generic/mutation/auditpolicy/inject.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/auditpolicy/inject_test.go → ...neric/mutation/auditpolicy/inject_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/etcd/inject.go → pkg/handlers/generic/mutation/etcd/inject.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/etcd/inject_test.go → ...lers/generic/mutation/etcd/inject_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/etcd/variables.go → ...ndlers/generic/mutation/etcd/variables.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/etcd/variables_test.go → ...s/generic/mutation/etcd/variables_test.go
View file
Open in desktop
File renamed without changes.
0 ...handlers/extraapiservercertsans/inject.go → ...mutation/extraapiservercertsans/inject.go
View file
Open in desktop
File renamed without changes.
0 ...ers/extraapiservercertsans/inject_test.go → ...ion/extraapiservercertsans/inject_test.go
View file
Open in desktop
File renamed without changes.
0 ...dlers/extraapiservercertsans/variables.go → ...ation/extraapiservercertsans/variables.go
View file
Open in desktop
File renamed without changes.
0 .../extraapiservercertsans/variables_test.go → .../extraapiservercertsans/variables_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/httpproxy/doc.go → ...andlers/generic/mutation/httpproxy/doc.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/httpproxy/inject.go → ...lers/generic/mutation/httpproxy/inject.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/httpproxy/inject_test.go → ...generic/mutation/httpproxy/inject_test.go
View file
Open in desktop
File renamed without changes.
0 ...andlers/httpproxy/systemd_proxy_config.go → ...utation/httpproxy/systemd_proxy_config.go
View file
Open in desktop
File renamed without changes.
0 ...rs/httpproxy/systemd_proxy_config_test.go → ...on/httpproxy/systemd_proxy_config_test.go
View file
Open in desktop
File renamed without changes.
0 ...ers/httpproxy/templates/systemd.conf.tmpl → ...ion/httpproxy/templates/systemd.conf.tmpl
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/httpproxy/variables.go → ...s/generic/mutation/httpproxy/variables.go
View file
Open in desktop
File renamed without changes.
0 pkg/handlers/httpproxy/variables_test.go → ...eric/mutation/httpproxy/variables_test.go
View file
Open in desktop
File renamed without changes.
0 ...dlers/kubernetesimagerepository/inject.go → ...ation/kubernetesimagerepository/inject.go
View file
Open in desktop
File renamed without changes.
0 .../kubernetesimagerepository/inject_test.go → .../kubernetesimagerepository/inject_test.go
View file
Open in desktop
File renamed without changes.
0 ...rs/kubernetesimagerepository/variables.go → ...on/kubernetesimagerepository/variables.go
View file
Open in desktop
File renamed without changes.
0 ...bernetesimagerepository/variables_test.go → ...bernetesimagerepository/variables_test.go
View file
Open in desktop
File renamed without changes.