Merge branch 'refs/heads/main' into feature/update-connector

.github/workflows/lint.yml

@@ -23,6 +23,6 @@ jobs:
           cache: true
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v5
+        uses: golangci/golangci-lint-action@v6.0.1
         with:
-          version: latest
+          version: v1.55.2

.golangci.yml

@@ -3,3 +3,6 @@ issues:
     - linters:
         - errcheck
       text: "Error return value of `d.Set` is not checked"
+output:
+  formats:
+    - format: colored-line-number

Makefile

@@ -3,7 +3,7 @@ NAMESPACE=openvpn
 NAME=cloudconnexa
 VERSION=0.0.12
 BINARY=terraform-provider-${NAME}
-OS_ARCH=darwin_arm64
+OS_ARCH=$(shell go env GOHOSTOS)_$(shell go env GOHOSTARCH)
 
 default: install
 

cloudconnexa/data_source_application.go

@@ -0,0 +1,58 @@
+package cloudconnexa
+
+import (
+	"context"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa"
+)
+
+func dataSourceApplication() *schema.Resource {
+	return &schema.Resource{
+		ReadContext: dataSourceApplicationRead,
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"description": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"routes": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     resourceApplicationRoute(),
+			},
+			"config": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     resourceApplicationConfig(),
+			},
+			"network_item_type": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"network_item_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
+	}
+}
+
+func dataSourceApplicationRead(ctx context.Context, data *schema.ResourceData, i interface{}) diag.Diagnostics {
+	c := i.(*cloudconnexa.Client)
+	var diags diag.Diagnostics
+	var name = data.Get("name").(string)
+	application, err := c.Applications.GetByName(name)
+
+	if err != nil {
+		return diag.FromErr(err)
+	}
+	if application == nil {
+		return append(diags, diag.Errorf("Application with name %s was not found", name)...)
+	}
+	setApplicationData(data, application)
+	return nil
+}

cloudconnexa/data_source_host.go

@@ -15,6 +15,11 @@ func dataSourceHost() *schema.Resource {
 		Description: "Use an `cloudconnexa_host` data source to read an existing CloudConnexa connector.",
 		ReadContext: dataSourceHostRead,
 		Schema: map[string]*schema.Schema{
+			"host_id": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The host ID.",
+			},
 			"name": {
 				Type:        schema.TypeString,
 				Required:    true,
@@ -88,6 +93,7 @@ func dataSourceHostRead(ctx context.Context, d *schema.ResourceData, m interface
 	if err != nil {
 		return append(diags, diag.FromErr(err)...)
 	}
+	d.Set("host_id", host.Id)
 	d.Set("name", host.Name)
 	d.Set("internet_access", host.InternetAccess)
 	d.Set("system_subnets", host.SystemSubnets)

cloudconnexa/provider.go

@@ -45,14 +45,15 @@ func Provider() *schema.Provider {
 			},
 		},
 		ResourcesMap: map[string]*schema.Resource{
-			"cloudconnexa_network":    resourceNetwork(),
-			"cloudconnexa_connector":  resourceConnector(),
-			"cloudconnexa_route":      resourceRoute(),
-			"cloudconnexa_dns_record": resourceDnsRecord(),
-			"cloudconnexa_user":       resourceUser(),
-			"cloudconnexa_host":       resourceHost(),
-			"cloudconnexa_user_group": resourceUserGroup(),
-			"cloudconnexa_ip_service": resourceIPService(),
+			"cloudconnexa_network":     resourceNetwork(),
+			"cloudconnexa_connector":   resourceConnector(),
+			"cloudconnexa_route":       resourceRoute(),
+			"cloudconnexa_dns_record":  resourceDnsRecord(),
+			"cloudconnexa_user":        resourceUser(),
+			"cloudconnexa_host":        resourceHost(),
+			"cloudconnexa_user_group":  resourceUserGroup(),
+			"cloudconnexa_ip_service":  resourceIPService(),
+			"cloudconnexa_application": resourceApplication(),
 		},
 
 		DataSourcesMap: map[string]*schema.Resource{
@@ -64,6 +65,7 @@ func Provider() *schema.Provider {
 			"cloudconnexa_network_routes": dataSourceNetworkRoutes(),
 			"cloudconnexa_host":           dataSourceHost(),
 			"cloudconnexa_ip_service":     dataSourceIPService(),
+			"cloudconnexa_application":    dataSourceApplication(),
 		},
 		ConfigureContextFunc: providerConfigure,
 	}