Skip to content
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.

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

CDPCP-10932 - GCP environment creation Terraform Resource fails due to unknown values on some parameters #68

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
- name: Go Coverage
uses: gwatts/[email protected]
with:
coverage-threshold: 18.2
coverage-threshold: 18.6
cover-pkg: ./...
ignore-pattern: |
/cdp-sdk-go/
Expand Down
55 changes: 55 additions & 0 deletions resources/environments/converter_common.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
// Copyright 2023 Cloudera. All Rights Reserved.
//
// This file is licensed under the Apache License Version 2.0 (the "License").
// You may not use this file except in compliance with the License.
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
//
// This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
// OF ANY KIND, either express or implied. Refer to the License for the specific
// permissions and limitations governing your use of the file.

package environments

import (
"github.com/hashicorp/terraform-plugin-framework/types"

environmentsmodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models"
"github.com/cloudera/terraform-provider-cdp/utils"
)

func ConvertFreeIpaInstances(freeIpaInstances []*environmentsmodels.FreeIpaInstance) *[]FreeIpaInstance {
var instances []FreeIpaInstance
if freeIpaInstances != nil || len(freeIpaInstances) > 0 {
instances = make([]FreeIpaInstance, 0)
for _, instance := range freeIpaInstances {
var attachedVolumes []*AttachedVolumeDetail
if instance.AttachedVolumes != nil {
attachedVolumes = make([]*AttachedVolumeDetail, 0)
for _, volume := range instance.AttachedVolumes {
attachedVolumes = append(attachedVolumes, &AttachedVolumeDetail{
Count: utils.ConvertInt32ToTypesInt64(volume.Count),
Size: utils.ConvertInt32ToTypesInt64(volume.Size),
VolumeType: types.StringValue(volume.VolumeType),
})
}
}
instances = append(instances, FreeIpaInstance{
AttachedVolumes: attachedVolumes,
AvailabilityZone: types.StringValue(instance.AvailabilityZone),
DiscoveryFQDN: types.StringValue(instance.DiscoveryFQDN),
InstanceGroup: types.StringValue(instance.InstanceGroup),
InstanceID: types.StringValue(instance.InstanceID),
InstanceStatus: types.StringValue(instance.InstanceStatus),
InstanceStatusReason: types.StringValue(instance.InstanceStatusReason),
InstanceType: types.StringValue(instance.InstanceType),
InstanceVMType: types.StringValue(instance.InstanceVMType),
LifeCycle: types.StringValue(instance.LifeCycle),
PrivateIP: types.StringValue(instance.PrivateIP),
PublicIP: types.StringValue(instance.PublicIP),
SSHPort: utils.ConvertInt32ToTypesInt64(instance.SSHPort),
SubnetID: types.StringValue(instance.SubnetID),
})
}
}
return &instances
}
119 changes: 119 additions & 0 deletions resources/environments/converter_common_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
// Copyright 2023 Cloudera. All Rights Reserved.
//
// This file is licensed under the Apache License Version 2.0 (the "License").
// You may not use this file except in compliance with the License.
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
//
// This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
// OF ANY KIND, either express or implied. Refer to the License for the specific
// permissions and limitations governing your use of the file.

package environments

import (
"github.com/stretchr/testify/assert"
"testing"

environmentsmodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models"
"github.com/cloudera/terraform-provider-cdp/utils"
)

func TestConvertFreeIpaInstancesWhenResultShouldBeEmpty(t *testing.T) {
tests := []struct {
name string
input []*environmentsmodels.FreeIpaInstance
}{
{name: "test when input slice is nil", input: nil},
{name: "test when input slice is empty", input: make([]*environmentsmodels.FreeIpaInstance, 0)},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
result := ConvertFreeIpaInstances(test.input)
assert.NotNil(t, result)
assert.Equal(t, 0, len(*result))
})
}
}

func TestConvertFreeIpaInstancesForRootBasicComponents(t *testing.T) {
testElement := createTestFreeIpaInstanceOfEnvironmentmodels()
input := make([]*environmentsmodels.FreeIpaInstance, 0)
input = append(input, testElement)

result := ConvertFreeIpaInstances(input)

assert.Equal(t, testElement.PublicIP, (*result)[0].PublicIP.ValueString())
assert.Equal(t, testElement.SubnetID, (*result)[0].SubnetID.ValueString())
assert.Equal(t, testElement.LifeCycle, (*result)[0].LifeCycle.ValueString())
assert.Equal(t, testElement.PrivateIP, (*result)[0].PrivateIP.ValueString())
assert.Equal(t, testElement.InstanceID, (*result)[0].InstanceID.ValueString())
assert.Equal(t, testElement.InstanceType, (*result)[0].InstanceType.ValueString())
assert.Equal(t, testElement.DiscoveryFQDN, (*result)[0].DiscoveryFQDN.ValueString())
assert.Equal(t, testElement.InstanceGroup, (*result)[0].InstanceGroup.ValueString())
assert.Equal(t, testElement.InstanceStatus, (*result)[0].InstanceStatus.ValueString())
assert.Equal(t, testElement.InstanceVMType, (*result)[0].InstanceVMType.ValueString())
assert.Equal(t, testElement.InstanceStatusReason, (*result)[0].InstanceStatusReason.ValueString())
assert.Equal(t, func(i int32) int64 { return int64(i) }(testElement.SSHPort), (*result)[0].SSHPort.ValueInt64())
}

func TestConvertFreeIpaInstancesForAttachedVolumesSize(t *testing.T) {
testElement := createTestFreeIpaInstanceOfEnvironmentmodels()
testElement.AttachedVolumes = append(testElement.AttachedVolumes, &environmentsmodels.AttachedVolumeDetail{
Count: 4321,
Size: 4321,
VolumeType: "someOtherVolumeType",
})
input := make([]*environmentsmodels.FreeIpaInstance, 0)
input = append(input, testElement)

result := ConvertFreeIpaInstances(input)

assert.Equal(t, len(testElement.AttachedVolumes), len((*result)[0].AttachedVolumes))
}

func TestConvertFreeIpaInstancesForAttachedVolumesContent(t *testing.T) {
testElement := createTestFreeIpaInstanceOfEnvironmentmodels()
input := make([]*environmentsmodels.FreeIpaInstance, 0)
input = append(input, testElement)

result := ConvertFreeIpaInstances(input)

assert.Equal(t, testElement.AttachedVolumes[0].VolumeType, (*result)[0].AttachedVolumes[0].VolumeType.ValueString())
assert.Equal(t, utils.ConvertInt32ToTypesInt64(testElement.AttachedVolumes[0].Count), (*result)[0].AttachedVolumes[0].Count)
assert.Equal(t, utils.ConvertInt32ToTypesInt64(testElement.AttachedVolumes[0].Size), (*result)[0].AttachedVolumes[0].Size)
}

func TestConvertFreeIpaInstancesIfThereAreMultipleInputsThenMultipleOutputShoutReturn(t *testing.T) {
input := make([]*environmentsmodels.FreeIpaInstance, 0)
input = append(input, createTestFreeIpaInstanceOfEnvironmentmodels())
input = append(input, createTestFreeIpaInstanceOfEnvironmentmodels())

assert.Equal(t, len(input), len(*ConvertFreeIpaInstances(input)))
}

func createTestFreeIpaInstanceOfEnvironmentmodels() *environmentsmodels.FreeIpaInstance {
return &environmentsmodels.FreeIpaInstance{
AttachedVolumes: func(slc []*environmentsmodels.AttachedVolumeDetail) []*environmentsmodels.AttachedVolumeDetail {
vol := &environmentsmodels.AttachedVolumeDetail{
Count: 1234,
Size: 1234,
VolumeType: "someVolumeType",
}
slc = append(slc, vol)
return slc
}(make([]*environmentsmodels.AttachedVolumeDetail, 0)),
AvailabilityZone: "someAvailabilityZone",
DiscoveryFQDN: "someDiscoveryFQDN",
InstanceGroup: "someInstanceGroup",
InstanceID: "someInstanceID",
InstanceStatus: "someInstanceStatus",
InstanceStatusReason: "someInstanceStatusReason",
InstanceType: "someInstanceType",
InstanceVMType: "someInstanceVMType",
LifeCycle: "someLifeCycle",
PrivateIP: "somePrivateIP",
PublicIP: "somePublicIP",
SSHPort: 1234,
SubnetID: "someSubnetID",
}
}
7 changes: 7 additions & 0 deletions resources/environments/converter_gcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,11 @@ func toGcpEnvironmentResource(ctx context.Context, env *environmentsmodels.Envir
}
model.EnableTunnel = types.BoolValue(env.TunnelEnabled)
model.WorkloadAnalytics = types.BoolValue(env.WorkloadAnalytics)
if env.Freeipa != nil {
model.FreeIpa = &GcpFreeIpa{
InstanceCountByGroup: utils.ConvertIntToTypesInt64(len(env.Freeipa.Instances)),
Recipes: utils.ConvertStringSliceToTypesSet(env.Freeipa.Recipes),
Instances: ConvertFreeIpaInstances(env.Freeipa.Instances),
}
}
}
36 changes: 36 additions & 0 deletions resources/environments/model_common_environment.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// Copyright 2023 Cloudera. All Rights Reserved.
//
// This file is licensed under the Apache License Version 2.0 (the "License").
// You may not use this file except in compliance with the License.
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
//
// This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
// OF ANY KIND, either express or implied. Refer to the License for the specific
// permissions and limitations governing your use of the file.

package environments

import "github.com/hashicorp/terraform-plugin-framework/types"

type FreeIpaInstance struct {
AttachedVolumes []*AttachedVolumeDetail `tfsdk:"attachedVolumes"`
AvailabilityZone types.String `tfsdk:"availabilityZone"`
DiscoveryFQDN types.String `tfsdk:"discoveryFQDN"`
InstanceGroup types.String `tfsdk:"instanceGroup"`
InstanceID types.String `tfsdk:"instanceId"`
InstanceStatus types.String `tfsdk:"instanceStatus"`
InstanceStatusReason types.String `tfsdk:"instanceStatusReason"`
InstanceType types.String `tfsdk:"instanceType"`
InstanceVMType types.String `tfsdk:"instanceVmType"`
LifeCycle types.String `tfsdk:"lifeCycle"`
PrivateIP types.String `tfsdk:"privateIP"`
PublicIP types.String `tfsdk:"publicIP"`
SSHPort types.Int64 `tfsdk:"sshPort"`
SubnetID types.String `tfsdk:"subnetId"`
}

type AttachedVolumeDetail struct {
Count types.Int64 `tfsdk:"count"`
Size types.Int64 `tfsdk:"size"`
VolumeType types.String `tfsdk:"volumeType"`
}
7 changes: 4 additions & 3 deletions resources/environments/model_gcp_environment.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,10 @@ type gcpEnvironmentResourceModel struct {
}

type GcpFreeIpa struct {
InstanceCountByGroup types.Int64 `tfsdk:"instance_count_by_group"`
Recipes types.Set `tfsdk:"recipes"`
InstanceType types.String `tfsdk:"instance_type"`
InstanceCountByGroup types.Int64 `tfsdk:"instance_count_by_group"`
Recipes types.Set `tfsdk:"recipes"`
InstanceType types.String `tfsdk:"instance_type"`
Instances *[]FreeIpaInstance `tfsdk:"instances"`
}

type ExistingNetworkParams struct {
Expand Down
22 changes: 22 additions & 0 deletions utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ package utils
import (
"context"
"fmt"
"github.com/hashicorp/terraform-plugin-framework/attr"
"github.com/hashicorp/terraform-plugin-log/tflog"
"time"

Expand Down Expand Up @@ -128,3 +129,24 @@ func FromSetValueToStringList(tl types.Set) []string {
}
return res
}

func ConvertStringSliceToTypesSet(input []string) types.Set {
var elems []attr.Value
elems = make([]attr.Value, len(input))
for _, str := range input {
elems = append(elems, types.StringValue(str))
}
var set types.Set
set, _ = types.SetValue(types.StringType, elems)
return set
}

func ConvertIntToTypesInt64(input int) types.Int64 {
upgraded := int64(input)
return types.Int64Value(upgraded)
}

func ConvertInt32ToTypesInt64(input int32) types.Int64 {
upgraded := int64(input)
return types.Int64Value(upgraded)
}
Loading