Added - Support for Service Manager Proxy service

Author: Bhagyashree Shetty

oci/service_manager_proxy_clients.go

@@ -0,0 +1,34 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package oci
+
+import (
+	oci_service_manager_proxy "github.com/oracle/oci-go-sdk/v51/servicemanagerproxy"
+
+	oci_common "github.com/oracle/oci-go-sdk/v51/common"
+)
+
+func init() {
+	RegisterOracleClient("oci_service_manager_proxy.ServiceManagerProxyClient", &OracleClient{InitClientFn: initServicemanagerproxyServiceManagerProxyClient})
+}
+
+func initServicemanagerproxyServiceManagerProxyClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
+	client, err := oci_service_manager_proxy.NewServiceManagerProxyClientWithConfigurationProvider(configProvider)
+	if err != nil {
+		return nil, err
+	}
+	err = configureClient(&client.BaseClient)
+	if err != nil {
+		return nil, err
+	}
+
+	if serviceClientOverrides.hostUrlOverride != "" {
+		client.Host = serviceClientOverrides.hostUrlOverride
+	}
+	return &client, nil
+}
+
+func (m *OracleClients) serviceManagerProxyClient() *oci_service_manager_proxy.ServiceManagerProxyClient {
+	return m.GetClient("oci_service_manager_proxy.ServiceManagerProxyClient").(*oci_service_manager_proxy.ServiceManagerProxyClient)
+}

oci/service_manager_proxy_service_environment_data_source.go

@@ -0,0 +1,236 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package oci
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	oci_service_manager_proxy "github.com/oracle/oci-go-sdk/v51/servicemanagerproxy"
+)
+
+func init() {
+	RegisterDatasource("oci_service_manager_proxy_service_environment", ServiceManagerProxyServiceEnvironmentDataSource())
+}
+
+func ServiceManagerProxyServiceEnvironmentDataSource() *schema.Resource {
+	return &schema.Resource{
+		Read: readSingularServiceManagerProxyServiceEnvironment,
+		Schema: map[string]*schema.Schema{
+			"compartment_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"service_environment_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			// Computed
+			"console_url": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"service_definition": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						// Required
+
+						// Optional
+
+						// Computed
+						"display_name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"short_display_name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"type": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"service_environment_endpoints": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						// Required
+
+						// Optional
+
+						// Computed
+						"environment_type": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"url": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"subscription_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func readSingularServiceManagerProxyServiceEnvironment(d *schema.ResourceData, m interface{}) error {
+	sync := &ServiceManagerProxyServiceEnvironmentDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).serviceManagerProxyClient()
+
+	return ReadResource(sync)
+}
+
+type ServiceManagerProxyServiceEnvironmentDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_service_manager_proxy.ServiceManagerProxyClient
+	Res    *oci_service_manager_proxy.GetServiceEnvironmentResponse
+}
+
+func (s *ServiceManagerProxyServiceEnvironmentDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *ServiceManagerProxyServiceEnvironmentDataSourceCrud) Get() error {
+	request := oci_service_manager_proxy.GetServiceEnvironmentRequest{}
+
+	if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
+		tmp := compartmentId.(string)
+		request.CompartmentId = &tmp
+	}
+
+	if serviceEnvironmentId, ok := s.D.GetOkExists("service_environment_id"); ok {
+		tmp := serviceEnvironmentId.(string)
+		request.ServiceEnvironmentId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = GetRetryPolicy(false, "service_manager_proxy")
+
+	response, err := s.Client.GetServiceEnvironment(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *ServiceManagerProxyServiceEnvironmentDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(*s.Res.Id)
+
+	s.D.Set("compartment_id", *s.Res.CompartmentId)
+
+	if s.Res.ConsoleUrl != nil {
+		s.D.Set("console_url", *s.Res.ConsoleUrl)
+	}
+
+	if s.Res.ServiceDefinition != nil {
+		s.D.Set("service_definition", []interface{}{ServiceDefinitionToMap(s.Res.ServiceDefinition)})
+	} else {
+		s.D.Set("service_definition", nil)
+	}
+
+	serviceEnvironmentEndpoints := []interface{}{}
+	for _, item := range s.Res.ServiceEnvironmentEndpoints {
+		serviceEnvironmentEndpoints = append(serviceEnvironmentEndpoints, ServiceEnvironmentEndPointOverviewToMap(item))
+	}
+	s.D.Set("service_environment_endpoints", serviceEnvironmentEndpoints)
+
+	s.D.Set("status", s.Res.Status)
+
+	if s.Res.SubscriptionId != nil {
+		s.D.Set("subscription_id", *s.Res.SubscriptionId)
+	}
+
+	return nil
+}
+
+func ServiceDefinitionToMap(obj *oci_service_manager_proxy.ServiceDefinition) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.DisplayName != nil {
+		result["display_name"] = string(*obj.DisplayName)
+	}
+
+	if obj.ShortDisplayName != nil {
+		result["short_display_name"] = string(*obj.ShortDisplayName)
+	}
+
+	if obj.Type != nil {
+		result["type"] = string(*obj.Type)
+	}
+
+	return result
+}
+
+func ServiceEnvironmentEndPointOverviewToMap(obj oci_service_manager_proxy.ServiceEnvironmentEndPointOverview) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	result["environment_type"] = string(obj.EnvironmentType)
+
+	if obj.Url != nil {
+		result["url"] = string(*obj.Url)
+	}
+
+	return result
+}
+
+func ServiceEnvironmentSummaryToMap(obj oci_service_manager_proxy.ServiceEnvironmentSummary) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.CompartmentId != nil {
+		result["compartment_id"] = string(*obj.CompartmentId)
+	}
+
+	if obj.ConsoleUrl != nil {
+		result["console_url"] = string(*obj.ConsoleUrl)
+	}
+
+	if obj.DefinedTags != nil {
+		result["defined_tags"] = definedTagsToMap(obj.DefinedTags)
+	}
+
+	result["freeform_tags"] = obj.FreeformTags
+
+	if obj.Id != nil {
+		result["id"] = string(*obj.Id)
+	}
+
+	if obj.ServiceDefinition != nil {
+		result["service_definition"] = []interface{}{ServiceDefinitionToMap(obj.ServiceDefinition)}
+	}
+
+	serviceEnvironmentEndpoints := []interface{}{}
+	for _, item := range obj.ServiceEnvironmentEndpoints {
+		serviceEnvironmentEndpoints = append(serviceEnvironmentEndpoints, ServiceEnvironmentEndPointOverviewToMap(item))
+	}
+	result["service_environment_endpoints"] = serviceEnvironmentEndpoints
+
+	result["status"] = string(obj.Status)
+
+	if obj.SubscriptionId != nil {
+		result["subscription_id"] = string(*obj.SubscriptionId)
+	}
+
+	return result
+}

oci/service_manager_proxy_service_environment_test.go

@@ -0,0 +1,81 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package oci
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+
+	"github.com/terraform-providers/terraform-provider-oci/httpreplay"
+)
+
+var (
+	serviceEnvironmentSingularDataSourceRepresentation = map[string]interface{}{
+		"compartment_id":         Representation{RepType: Required, Create: `${var.compartment_id}`},
+		"service_environment_id": Representation{RepType: Required, Create: `${var.service_environment_id}`},
+	}
+
+	ServiceEnvironmentResourceConfig = GenerateDataSourceFromRepresentationMap("oci_service_manager_proxy_service_environment", "test_service_environment", Required, Create, serviceEnvironmentSingularDataSourceRepresentation)
+
+	serviceEnvironmentDataSourceRepresentation = map[string]interface{}{
+		"compartment_id": Representation{RepType: Required, Create: `${var.compartment_id}`},
+	}
+
+	ServiceEnvironmentsResourceConfig = GenerateDataSourceFromRepresentationMap("oci_service_manager_proxy_service_environments", "test_service_environments", Required, Create, serviceEnvironmentDataSourceRepresentation)
+)
+
+// issue-routing-tag: service_manager_proxy/default
+func TestServiceManagerProxyServiceEnvironmentResource_basic(t *testing.T) {
+	httpreplay.SetScenario("TestServiceManagerProxyServiceEnvironmentResource_basic")
+	defer httpreplay.SaveScenario()
+
+	config := testProviderConfig()
+
+	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
+	serviceEnvironmentId := getEnvSettingWithBlankDefault("service_environment_id")
+
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+	serviceEnvironmentIdVariableStr := fmt.Sprintf("variable \"service_environment_id\" { default = \"%s\" }\n", serviceEnvironmentId)
+
+	datasourceName := "data.oci_service_manager_proxy_service_environments.test_service_environments"
+	singularDatasourceName := "data.oci_service_manager_proxy_service_environment.test_service_environment"
+
+	SaveConfigContent("", "", "", t)
+
+	ResourceTest(t, nil, []resource.TestStep{
+		// verify datasource
+		{
+			Config: config +
+				GenerateDataSourceFromRepresentationMap("oci_service_manager_proxy_service_environments", "test_service_environments", Required, Create, serviceEnvironmentDataSourceRepresentation) +
+				compartmentIdVariableStr,
+
+			Check: ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttrSet(datasourceName, "compartment_id"),
+				resource.TestCheckResourceAttrSet(datasourceName, "id"),
+				resource.TestCheckResourceAttrSet(datasourceName, "service_environment_collection.0.items.0.service_definition.0.display_name"),
+				resource.TestCheckResourceAttrSet(datasourceName, "service_environment_collection.0.items.0.service_definition.0.type"),
+				resource.TestCheckResourceAttr(datasourceName, "service_environment_collection.#", "1"),
+			),
+		},
+		// verify singular datasource
+		{
+			Config: config +
+				GenerateDataSourceFromRepresentationMap("oci_service_manager_proxy_service_environment", "test_service_environment", Required, Create, serviceEnvironmentSingularDataSourceRepresentation) +
+				compartmentIdVariableStr + serviceEnvironmentIdVariableStr,
+
+			Check: ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "compartment_id"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "service_environment_id"),
+
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "console_url"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "service_definition.#", "1"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "status"),
+				resource.TestCheckResourceAttrSet(singularDatasourceName, "subscription_id"),
+			),
+		},
+	})
+}