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.

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

Fix update proxy in cluster rosa #309

Merged
merged 1 commit into from
Sep 26, 2023
Merged

Fix update proxy in cluster rosa #309

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
40 changes: 18 additions & 22 deletions provider/clusterrosaclassic/cluster_rosa_classic_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"errors"
"fmt"
"net/http"
"reflect"
"sort"
"strings"
"time"
Expand Down Expand Up @@ -711,24 +712,26 @@ func buildProxy(state *ClusterRosaClassicState, builder *cmv1.ClusterBuilder) (*
if state.Proxy != nil {
httpsProxy := ""
httpProxy := ""
httpNoProxy := ""
additionalTrustBundle := ""

if !common.IsStringAttributeEmpty(state.Proxy.HttpProxy) {
httpProxy = state.Proxy.HttpProxy.ValueString()
proxy.HTTPProxy(httpProxy)
}
proxy.HTTPProxy(httpProxy)
if !common.IsStringAttributeEmpty(state.Proxy.HttpsProxy) {
httpsProxy = state.Proxy.HttpsProxy.ValueString()
proxy.HTTPSProxy(httpsProxy)
}
proxy.HTTPSProxy(httpsProxy)
if !common.IsStringAttributeEmpty(state.Proxy.NoProxy) {
proxy.NoProxy(state.Proxy.NoProxy.ValueString())
httpNoProxy = state.Proxy.NoProxy.ValueString()
}
proxy.NoProxy(httpNoProxy)

if !common.IsStringAttributeEmpty(state.Proxy.AdditionalTrustBundle) {
additionalTrustBundle = state.Proxy.AdditionalTrustBundle.ValueString()
builder.AdditionalTrustBundle(additionalTrustBundle)
}
builder.AdditionalTrustBundle(additionalTrustBundle)

builder.Proxy(proxy)
}
Expand Down Expand Up @@ -1032,7 +1035,7 @@ func (r *ClusterRosaClassicResource) Update(ctx context.Context, request resourc
return
}

clusterBuilder, _, err = updateProxy(state, plan, clusterBuilder)
clusterBuilder, err = updateProxy(state, plan, clusterBuilder)
if err != nil {
response.Diagnostics.AddError(
"Can't update cluster",
Expand Down Expand Up @@ -1288,30 +1291,21 @@ func scheduleUpgrade(ctx context.Context, client *cmv1.ClustersClient, clusterID
return nil
}

func updateProxy(state, plan *ClusterRosaClassicState, clusterBuilder *cmv1.ClusterBuilder) (*cmv1.ClusterBuilder, bool, error) {
shouldUpdateProxy := false
if (state.Proxy == nil && plan.Proxy != nil) || (state.Proxy != nil && plan.Proxy == nil) {
shouldUpdateProxy = true
} else if state.Proxy != nil && plan.Proxy != nil {
_, patchNoProxy := common.ShouldPatchString(state.Proxy.NoProxy, plan.Proxy.NoProxy)
_, patchHttpProxy := common.ShouldPatchString(state.Proxy.HttpProxy, plan.Proxy.HttpProxy)
_, patchHttpsProxy := common.ShouldPatchString(state.Proxy.HttpsProxy, plan.Proxy.HttpsProxy)
_, patchAdditionalTrustBundle := common.ShouldPatchString(state.Proxy.AdditionalTrustBundle, plan.Proxy.AdditionalTrustBundle)
if patchNoProxy || patchHttpProxy || patchHttpsProxy || patchAdditionalTrustBundle {
shouldUpdateProxy = true
}
}

if shouldUpdateProxy {
func updateProxy(state, plan *ClusterRosaClassicState, clusterBuilder *cmv1.ClusterBuilder) (*cmv1.ClusterBuilder, error) {
if !reflect.DeepEqual(state.Proxy, plan.Proxy) {
var err error
if plan.Proxy == nil {
plan.Proxy = &proxy.Proxy{}
}
clusterBuilder, err = buildProxy(plan, clusterBuilder)
if err != nil {
return nil, false, err
return nil, err
}
}

return clusterBuilder, shouldUpdateProxy, nil
return clusterBuilder, nil
}

func updateNodes(ctx context.Context, state, plan *ClusterRosaClassicState, clusterBuilder *cmv1.ClusterBuilder) (*cmv1.ClusterBuilder, bool, error) {
// Send request to update the cluster:
shouldUpdateNodes := false
Expand Down Expand Up @@ -1623,6 +1617,8 @@ func populateRosaClassicClusterState(ctx context.Context, object *cmv1.Cluster,
if ok {
state.Proxy.NoProxy = types.StringValue(noProxy)
}
} else {
state.Proxy = nil
}

trustBundle, ok := object.GetAdditionalTrustBundle()
Expand Down
20 changes: 2 additions & 18 deletions provider/proxy/proxy_validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@ package proxy
import (
"context"
"fmt"
"github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
"github.com/openshift/rosa/pkg/helper"
"github.com/terraform-redhat/terraform-provider-rhcs/provider/common"
"strings"

"github.com/hashicorp/terraform-plugin-framework/schema/validator"
)

// atLeastValidator validates that an integer Attribute's value is at least a certain value.
Expand Down Expand Up @@ -40,31 +37,18 @@ func (v proxyValidator) ValidateObject(ctx context.Context, request validator.Ob
errSum := "Invalid proxy's attribute assignment"
httpsProxy := ""
httpProxy := ""
additionalTrustBundle := ""
var noProxySlice []string

if !common.IsStringAttributeEmpty(proxy.HttpProxy) {
httpProxy = proxy.HttpProxy.ValueString()
}
if !common.IsStringAttributeEmpty(proxy.HttpsProxy) {
httpsProxy = proxy.HttpsProxy.ValueString()
}
if !common.IsStringAttributeEmpty(proxy.NoProxy) {
noProxySlice = helper.HandleEmptyStringOnSlice(strings.Split(proxy.NoProxy.ValueString(), ","))
}

if !common.IsStringAttributeEmpty(proxy.AdditionalTrustBundle) {
additionalTrustBundle = proxy.AdditionalTrustBundle.ValueString()
}

if httpProxy == "" && httpsProxy == "" && noProxySlice != nil && len(noProxySlice) > 0 {
if httpProxy == "" && httpsProxy == "" {
response.Diagnostics.AddError(errSum, "Expected at least one of the following: http-proxy, https-proxy")
return
}
if httpProxy == "" && httpsProxy == "" && additionalTrustBundle == "" {
response.Diagnostics.AddError(errSum, "Expected at least one of the following: http-proxy, https-proxy, additional-trust-bundle")
return
}
}

func ProxyValidator() validator.Object {
Expand Down
38 changes: 18 additions & 20 deletions subsystem/cluster_resource_rosa_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1561,7 +1561,7 @@ var _ = Describe("rhcs_cluster_rosa_classic - create", func() {
Expect(resource).To(MatchJQ(`.attributes.proxy.no_proxy`, "test"))
Expect(resource).To(MatchJQ(`.attributes.proxy.additional_trust_bundle`, "123"))
})
It("Creates cluster without http proxy and update trust bundle", func() {
It("Creates cluster without http proxy and update trust bundle - should fail", func() {
// Prepare the server:
server.AppendHandlers(
CombineHandlers(
Expand Down Expand Up @@ -1692,9 +1692,7 @@ var _ = Describe("rhcs_cluster_rosa_classic - create", func() {
}
}
`)
Expect(terraform.Apply()).To(BeZero())
resource := terraform.Resource("rhcs_cluster_rosa_classic", "my_cluster")
Expect(resource).To(MatchJQ(`.attributes.proxy.additional_trust_bundle`, "123"))
Expect(terraform.Apply()).ToNot(BeZero())
})
})
It("Creates cluster with default_mp_labels and update them", func() {
Expand Down Expand Up @@ -1889,23 +1887,23 @@ var _ = Describe("rhcs_cluster_rosa_classic - create", func() {

// Expected at least one of the following: http-proxy, https-proxy, additional-trust-bundle
terraform.Source(`
resource "rhcs_cluster_rosa_classic" "my_cluster" {
name = "my-cluster"
cloud_region = "us-west-1"
aws_account_id = "123"
proxy = {
}
sts = {
operator_role_prefix = "test"
role_arn = "",
support_role_arn = "",
instance_iam_roles = {
master_role_arn = "",
worker_role_arn = "",
resource "rhcs_cluster_rosa_classic" "my_cluster" {
name = "my-cluster"
cloud_region = "us-west-1"
aws_account_id = "123"
proxy = {
}
}
}
`)
sts = {
operator_role_prefix = "test"
role_arn = "",
support_role_arn = "",
instance_iam_roles = {
master_role_arn = "",
worker_role_arn = "",
}
}
}
`)
Expect(terraform.Apply()).NotTo(BeZero())
})
It("Creates private cluster with aws subnet ids without private link", func() {
Expand Down