Skip to content

Commit

Permalink
Replace unstructured types (#2189)
Browse files Browse the repository at this point in the history
  • Loading branch information
@pPrecel
pPrecel authored Jul 15, 2024
1 parent db58aaf commit cbb07b0
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 64 deletions.
4 changes: 2 additions & 2 deletions internal/cmd/alpha/hana/map.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ func hanaAPIInstance(config *hanaCheckConfig) (*unstructured.Unstructured, error
Parameters: HanaAPIParameters{
TechnicalUser: true,
},
OfferingName: "hana-cloud",
PlanName: "admin-api-access",
ServiceOfferingName: "hana-cloud",
ServicePlanName: "admin-api-access",
},
}
return kube.ToUnstructured(requestData, btp.GVKServiceInstance)
Expand Down
132 changes: 77 additions & 55 deletions internal/cmd/alpha/hana/provision.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/kyma-project/cli.v3/internal/clierror"
"github.com/kyma-project/cli.v3/internal/cmdcommon"
"github.com/kyma-project/cli.v3/internal/kube"
"github.com/kyma-project/cli.v3/internal/kube/btp"
"github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -78,23 +79,38 @@ func runProvision(config *hanaProvisionConfig) clierror.Error {
}

func createHanaInstance(config *hanaProvisionConfig) clierror.Error {
_, err := config.KubeClient.Dynamic().Resource(btp.GVRServiceInstance).
hanaInstance, err := hanaInstance(config)
if err != nil {
return clierror.Wrap(err, clierror.New("failed to create Hana instance object"))
}

_, err = config.KubeClient.Dynamic().Resource(btp.GVRServiceInstance).
Namespace(config.namespace).
Create(config.Ctx, hanaInstance(config), metav1.CreateOptions{})
Create(config.Ctx, hanaInstance, metav1.CreateOptions{})
return handleProvisionResponse(err, "Hana instance", config.namespace, config.name)
}

func createHanaBinding(config *hanaProvisionConfig) clierror.Error {
_, err := config.KubeClient.Dynamic().Resource(btp.GVRServiceBinding).
hanaBinding, err := hanaBinding(config)
if err != nil {
return clierror.Wrap(err, clierror.New("failed to create Hana binding object"))
}

_, err = config.KubeClient.Dynamic().Resource(btp.GVRServiceBinding).
Namespace(config.namespace).
Create(config.Ctx, hanaBinding(config), metav1.CreateOptions{})
Create(config.Ctx, hanaBinding, metav1.CreateOptions{})
return handleProvisionResponse(err, "Hana binding", config.namespace, config.name)
}

func createHanaBindingURL(config *hanaProvisionConfig) clierror.Error {
_, err := config.KubeClient.Dynamic().Resource(btp.GVRServiceBinding).
hanaBindingURL, err := hanaBindingURL(config)
if err != nil {
return clierror.Wrap(err, clierror.New("failed to create Hana binding object"))
}

_, err = config.KubeClient.Dynamic().Resource(btp.GVRServiceBinding).
Namespace(config.namespace).
Create(config.Ctx, hanaBindingURL(config), metav1.CreateOptions{})
Create(config.Ctx, hanaBindingURL, metav1.CreateOptions{})
return handleProvisionResponse(err, "Hana URL binding", config.namespace, hanaBindingURLName(config.name))
}

Expand All @@ -106,69 +122,75 @@ func handleProvisionResponse(err error, printedName, namespace, name string) cli
return clierror.Wrap(err, clierror.New("failed to provision Hana resource"))
}

func hanaInstance(config *hanaProvisionConfig) *unstructured.Unstructured {
return &unstructured.Unstructured{
Object: map[string]interface{}{
"apiVersion": "services.cloud.sap.com/v1",
"kind": "ServiceInstance",
"metadata": map[string]interface{}{
"name": config.name,
},
"spec": map[string]interface{}{
"serviceOfferingName": "hana-cloud", // fixed
"servicePlanName": config.planName,
"externalName": config.name,
"parameters": map[string]interface{}{
"data": map[string]interface{}{
"memory": config.memory,
"vcpu": config.cpu,
"whitelistIPs": config.whitelistIP,
"generateSystemPassword": true, // TODO: manage it later
"edition": "cloud", // TODO: is it necessary?
},
func hanaInstance(config *hanaProvisionConfig) (*unstructured.Unstructured, error) {
serviceInstance := &btp.ServiceInstance{
TypeMeta: metav1.TypeMeta{
APIVersion: btp.ServicesAPIVersionV1,
Kind: btp.KindServiceInstance,
},
ObjectMeta: metav1.ObjectMeta{
Name: config.name,
},
Spec: btp.ServiceInstanceSpec{
ServiceOfferingName: "hana-cloud", // fixed
ServicePlanName: config.planName,
ExternalName: config.name,
Parameters: HanaInstanceParameters{
Data: HanaInstanceParametersData{
Memory: config.memory,
Vcpu: config.cpu,
WhitelistIPs: config.whitelistIP,
GenerateSystemPassword: true, // TODO: manage it later
Edition: "cloud", // TODO: is it necessary?
},
},
},
}

return kube.ToUnstructured(serviceInstance, btp.GVKServiceInstance)
}

func hanaBinding(config *hanaProvisionConfig) *unstructured.Unstructured {
return &unstructured.Unstructured{
Object: map[string]interface{}{
"apiVersion": "services.cloud.sap.com/v1",
"kind": "ServiceBinding",
"metadata": map[string]interface{}{
"name": config.name,
},
"spec": map[string]interface{}{
"serviceInstanceName": config.name,
"externalName": config.name,
"secretName": config.name,
"parameters": map[string]interface{}{
"scope": "administration", // fixed
"credential-type": "PASSWORD_GENERATED", // fixed
},
func hanaBinding(config *hanaProvisionConfig) (*unstructured.Unstructured, error) {
serviceBinding := &btp.ServiceBinding{
TypeMeta: metav1.TypeMeta{
APIVersion: btp.ServicesAPIVersionV1,
Kind: btp.KindServiceBinding,
},
ObjectMeta: metav1.ObjectMeta{
Name: config.name,
},
Spec: btp.ServiceBindingSpec{
ServiceInstanceName: config.name,
ExternalName: config.name,
SecretName: config.name,
Parameters: HanaBindingParameters{
Scope: "administration", // fixed
CredentialsType: "PASSWORD_GENERATED", // fixed
},
},
}

return kube.ToUnstructured(serviceBinding, btp.GVKServiceBinding)
}

func hanaBindingURL(config *hanaProvisionConfig) *unstructured.Unstructured {
func hanaBindingURL(config *hanaProvisionConfig) (*unstructured.Unstructured, error) {
urlName := hanaBindingURLName(config.name)
return &unstructured.Unstructured{
Object: map[string]interface{}{
"apiVersion": "services.cloud.sap.com/v1",
"kind": "ServiceBinding",
"metadata": map[string]interface{}{
"name": urlName,
},
"spec": map[string]interface{}{
"serviceInstanceName": config.name,
"externalName": urlName,
"secretName": urlName,
},
serviceBinding := &btp.ServiceBinding{
TypeMeta: metav1.TypeMeta{
APIVersion: btp.ServicesAPIVersionV1,
Kind: btp.KindServiceBinding,
},
ObjectMeta: metav1.ObjectMeta{
Name: urlName,
},
Spec: btp.ServiceBindingSpec{
ServiceInstanceName: config.name,
ExternalName: urlName,
SecretName: urlName,
},
}

return kube.ToUnstructured(serviceBinding, btp.GVKServiceBinding)
}

func hanaBindingURLName(name string) string {
Expand Down
17 changes: 17 additions & 0 deletions internal/cmd/alpha/hana/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,23 @@ type HanaAPIParameters struct {
TechnicalUser bool `json:"technicalUser"`
}

type HanaInstanceParameters struct {
Data HanaInstanceParametersData `json:"data"`
}

type HanaInstanceParametersData struct {
Memory int `json:"memory"`
Vcpu int `json:"vcpu"`
WhitelistIPs []string `json:"whitelistIPs"`
GenerateSystemPassword bool `json:"generateSystemPassword"`
Edition string `json:"edition"`
}

type HanaBindingParameters struct {
Scope string `json:"scope"`
CredentialsType string `json:"credential-type"`
}

type HanaMapping struct {
Platform string `json:"platform"`
PrimaryID string `json:"primaryID"`
Expand Down
6 changes: 3 additions & 3 deletions internal/cmd/alpha/referenceinstance/referenceinstance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ func fillRequestData(config referenceInstanceConfig) btp.ServiceInstance {
PlanNameSelector: config.planSelector,
},
},
OfferingName: config.offeringName,
PlanName: "reference-instance",
BTPCredentialsSecret: config.btpSecretName,
ServiceOfferingName: config.offeringName,
ServicePlanName: "reference-instance",
BTPAccessCredentialsSecret: config.btpSecretName,
},
}
return requestData
Expand Down
9 changes: 5 additions & 4 deletions internal/kube/btp/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,11 @@ type ServiceBinding struct {
}

type ServiceInstanceSpec struct {
Parameters interface{} `json:"parameters,omitempty"`
OfferingName string `json:"serviceOfferingName,omitempty"`
PlanName string `json:"servicePlanName,omitempty"`
BTPCredentialsSecret string `json:"btpAccessCredentialsSecret,omitempty"`
Parameters interface{} `json:"parameters,omitempty"`
ServiceOfferingName string `json:"serviceOfferingName,omitempty"`
ServicePlanName string `json:"servicePlanName,omitempty"`
BTPAccessCredentialsSecret string `json:"btpAccessCredentialsSecret,omitempty"`
ExternalName string `json:"externalName,omitempty"`
}

type ServiceBindingSpec struct {
Expand Down

0 comments on commit cbb07b0

Please sign in to comment.