Merge pull request #72 from Broadcom/AC-34142-terraform-app-icon-issue

Ac 34142 terraform app icon issue

VERSION

@@ -1 +1 @@
-1.1.9
+1.1.10

provider/data_source_aws_integration_test.go

@@ -8,15 +8,11 @@ import (
 
 const testAccResourceAwsIntegration = `
 	data "luminate_aws_integration" "my-aws_integration" {
-	  integration_name = "terraform-acceptance"
+	  integration_name = "terraform-test"
 	}
 `
 
 func TestAccLuminateDataSourceAwsIntegration(t *testing.T) {
-	// FIXME: https://jira.luminate.io/browse/AC-27711
-	t.Skip("Skipping testing see: https://jira.luminate.io/browse/AC-27711")
-	return
-
 	resourceName := "data.luminate_aws_integration.my-aws_integration"
 
 	resource.Test(t, resource.TestCase{

provider/resource_application.go

@@ -1,6 +1,7 @@
 package provider
 
 import (
+	"github.com/Broadcom/terraform-provider-luminate/service/dto"
 	"github.com/Broadcom/terraform-provider-luminate/utils"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -68,3 +69,14 @@ func CommonApplicationSchema() map[string]*schema.Schema {
 		},
 	}
 }
+func SetBaseApplicationFields(d *schema.ResourceData, application *dto.Application) {
+	d.Set("name", application.Name)
+	if application.Icon != "" {
+		d.Set("icon", application.Icon)
+	}
+	d.Set("visible", application.Visible)
+	d.Set("notification_enabled", application.NotificationsEnabled)
+	d.Set("external_address", application.ExternalAddress)
+	d.Set("subdomain", application.Subdomain)
+	d.Set("type", application.Type)
+}

provider/resource_rdp_application.go

@@ -141,17 +141,11 @@ func resourceDeleteRDPApplication(ctx context.Context, d *schema.ResourceData, m
 }
 
 func setRDPApplicationFields(d *schema.ResourceData, application *dto.Application) {
-	d.Set("name", application.Name)
+	SetBaseApplicationFields(d, application)
 	d.Set("collection_id", application.CollectionID)
 	d.Set("sub_type", application.SubType)
-	d.Set("icon", application.Icon)
-	d.Set("type", application.Type)
-	d.Set("visible", application.Visible)
 	d.Set("site_id", application.SiteID)
-	d.Set("notification_enabled", application.NotificationsEnabled)
 	d.Set("internal_address", application.InternalAddress)
-	d.Set("external_address", application.ExternalAddress)
-	d.Set("subdomain", application.Subdomain)
 	d.Set("luminate_address", application.LuminateAddress)
 }
 

provider/resource_segment_application.go

@@ -185,13 +185,8 @@ func extractSegmentApplication(d *schema.ResourceData) *dto.Application {
 }
 
 func setSegmentApplicationFields(d *schema.ResourceData, application *dto.Application, tenantBaseDomain string) {
-	d.Set("name", application.Name)
-	d.Set("icon", application.Icon)
-	d.Set("type", application.Type)
+	SetBaseApplicationFields(d, application)
 	d.Set("sub_type", application.SubType)
-	d.Set("visible", application.Visible)
-	d.Set("notification_enabled", application.NotificationsEnabled)
-	d.Set("external_address", application.ExternalAddress)
 	if application.SegmentSettings != nil {
 		d.Set("segment_settings", flattenSegmentSettings(application.SegmentSettings))
 	}

provider/resource_ssh_gw_application.go

@@ -173,14 +173,8 @@ func resourceDeleteSshGwApplication(ctx context.Context, d *schema.ResourceData,
 }
 
 func setSshGwApplicationFields(d *schema.ResourceData, application *dto.Application) {
-	d.Set("name", application.Name)
-	d.Set("icon", application.Icon)
-	d.Set("type", application.Type)
-	d.Set("visible", application.Visible)
-	d.Set("notification_enabled", application.NotificationsEnabled)
+	SetBaseApplicationFields(d, application)
 	d.Set("internal_address", application.InternalAddress)
-	d.Set("external_address", application.ExternalAddress)
-	d.Set("subdomain", application.Subdomain)
 	d.Set("luminate_address", application.LuminateAddress)
 	d.Set("segment_id", application.CloudIntegrationData.SegmentId)
 	d.Set("tags", application.CloudIntegrationData.Tags)

provider/resource_tcp_application.go

@@ -210,14 +210,8 @@ func extractTCPTargets(d *schema.ResourceData) []dto.TCPTarget {
 }
 
 func setTCPApplicationFields(d *schema.ResourceData, application *dto.Application) {
-	d.Set("name", application.Name)
+	SetBaseApplicationFields(d, application)
 	d.Set("collection_id", application.CollectionID)
-	d.Set("icon", application.Icon)
-	d.Set("type", application.Type)
-	d.Set("visible", application.Visible)
-	d.Set("notification_enabled", application.NotificationsEnabled)
-	d.Set("external_address", application.ExternalAddress)
-	d.Set("subdomain", application.Subdomain)
 	d.Set("luminate_address", application.LuminateAddress)
 	log.Printf("[DEBUG] Settings TCP Targets")
 

provider/resource_web_application.go

@@ -299,15 +299,9 @@ func extractWebApplication(d *schema.ResourceData) *dto.Application {
 }
 
 func setWebApplicationFields(d *schema.ResourceData, application *dto.Application, tenantBaseDomain string) {
-	d.Set("name", application.Name)
-	d.Set("icon", application.Icon)
-	d.Set("type", application.Type)
+	SetBaseApplicationFields(d, application)
 	d.Set("sub_type", application.SubType)
-	d.Set("visible", application.Visible)
-	d.Set("notification_enabled", application.NotificationsEnabled)
 	d.Set("internal_address", application.InternalAddress)
-	d.Set("external_address", application.ExternalAddress)
-	d.Set("subdomain", application.Subdomain)
 	d.Set("custom_external_address", application.CustomExternalAddress)
 	d.Set("collection_id", application.CollectionID)
 

provider/resource_web_application_test.go

@@ -16,6 +16,7 @@ resource "luminate_web_application" "new-application" {
  site_id = "${luminate_site.new-site.id}"
  name = "tfAccApplication"
  internal_address = "http://127.0.0.1:8080"
+ icon = "iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII="
 }
 `