Release/v12.0

.github/workflows/release.yml

@@ -0,0 +1,47 @@
+# This GitHub action can publish assets for release when a tag is created.
+# Currently its setup to run on any tag that matches the pattern "v*" (ie. v0.1.0).
+#
+# This uses an action (paultyng/ghaction-import-gpg) that assumes you set your
+# private key in the `GPG_PRIVATE_KEY` secret and passphrase in the `PASSPHRASE`
+# secret. If you would rather own your own GPG handling, please fork this action
+# or use an alternative one for key handling.
+#
+# You will need to pass the `--batch` flag to `gpg` in your signing step
+# in `goreleaser` to indicate this is being used in a non-interactive mode.
+#
+name: release
+on:
+  push:
+    tags:
+      - 'v*'
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Unshallow
+        run: git fetch --prune --unshallow
+      -
+        name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.14
+      -
+        name: Import GPG key
+        id: import_gpg
+        uses: paultyng/ghaction-import-gpg@v2.1.0
+        env:
+          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+          PASSPHRASE: ${{ secrets.PASSPHRASE }}
+      -
+        name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: release --rm-dist
+        env:
+          GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -7,6 +7,7 @@
 _obj
 _test
 _bin
+vendor
 
 # Architecture specific extensions/prefixes
 *.[568vq]
@@ -37,3 +38,5 @@ AccTest.log
 **/.idea
 *.old
 *.OLD
+
+

.goreleaser.yml

@@ -0,0 +1,54 @@
+# Visit https://goreleaser.com for documentation on how to customize this
+# behavior.
+before:
+  hooks:
+    # this is just an example and not a requirement for provider building/publishing
+    - go mod tidy
+builds:
+- env:
+    # goreleaser does not work with CGO, it could also complicate
+    # usage by users in CI/CD systems like Terraform Cloud where
+    # they are unable to install libraries.
+    - CGO_ENABLED=0
+  mod_timestamp: '{{ .CommitTimestamp }}'
+  flags:
+    - -trimpath
+  ldflags:
+    - '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}'
+  goos:
+    - freebsd
+    - windows
+    - linux
+    - darwin
+  goarch:
+    - amd64
+    - '386'
+    - arm
+    - arm64
+  ignore:
+    - goos: darwin
+      goarch: '386'
+  binary: '{{ .ProjectName }}_v{{ .Version }}'
+archives:
+- format: zip
+  name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
+checksum:
+  name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS'
+  algorithm: sha256
+signs:
+  - artifacts: checksum
+    args:
+      # if you are using this is a GitHub action or some other automated pipeline, you 
+      # need to pass the batch flag to indicate its not interactive.
+      - "--batch"
+      - "--local-user"
+      - "{{ .Env.GPG_FINGERPRINT }}" # set this environment variable for your signing key
+      - "--output"
+      - "${signature}"
+      - "--detach-sign"
+      - "${artifact}"
+release:
+  # If you want to manually examine the release before its live, uncomment this line:
+  # draft: true
+changelog:
+  skip: true

CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+### v3.0.0
+Breaking Changes:
+* Upgrade to terraform 0.12
+
 ### v1.3.8
 
 * Handle missing server when checking for existence of server network adapter (DimensionDataResearch/dd-cloud-compute-terraform#114).

Dockerfile

@@ -1,10 +1,52 @@
-FROM hashicorp/terraform:0.9.9
+# ---------------------------------------------------------------------------------------------------------------------
+# Terraform Build Image
 
-MAINTAINER Adam Friedman <adam.friedman@itaas.dimensiondata.com>
+# FROM golang:alpine as Build
+FROM golang:1.12.1-alpine as Build
+
+ENV TERRAFORM_VERSION=0.12.19
+ENV DDCLOUD_VERSION=3.0
 
-RUN mkdir -p /config
-VOLUME /config
+RUN apk add --update git bash openssh make
 
-WORKDIR /config
+ENV TF_DEV=true
+ENV TF_RELEASE=true
 
-COPY _bin/linux-amd64/terraform-provider-ddcloud /bin
+
+## Terraform
+WORKDIR $GOPATH/src/github.com/hashicorp/terraform
+RUN git clone https://github.com/hashicorp/terraform.git ./ && \
+    git checkout v${TERRAFORM_VERSION} && \
+    /bin/bash scripts/build.sh && \
+    ls -l /bin
+
+
+## DDCloud Provider
+WORKDIR $GOPATH/src/github.com/DimensionDataResearch/dd-cloud-compute-terraform
+RUN git clone https://github.com/DimensionDataResearch/dd-cloud-compute-terraform.git ./ && \
+    # git checkout v${DDCLOUD_VERSION} && \
+    git checkout development/v${DDCLOUD_VERSION} && \
+    go get github.com/pkg/errors && \
+    go get golang.org/x/crypto/pkcs12 && \
+    go get github.com/DimensionDataResearch/go-dd-cloud-compute/compute && \
+    make dev
+
+
+
+# ---------------------------------------------------------------------------------------------------------------------
+# Create Minimal Image 
+
+FROM alpine
+RUN apk add --update git bash openssh curl
+COPY --from=build /go/bin/terraform /bin 
+COPY --from=build /usr/local/bin/terraform-provider-ddcloud /bin
+
+
+## Kubectl binadry download (The K8s/Helm Terraform providers are not yet able to perform all the configuration required during a deployment)
+RUN wget https://storage.googleapis.com/kubernetes-release/release/v1.15.3/bin/linux/amd64/kubectl && \
+    chmod +x ./kubectl && \
+    mv ./kubectl /usr/local/bin/kubectl
+
+WORKDIR /bin
+
+ENTRYPOINT ["terraform"]

Makefile

@@ -1,10 +1,9 @@
 PROVIDER_NAME = ddcloud
 
-VERSION = 2.3.2
+VERSION = 3.0.5
 VERSION_INFO_FILE = ./$(PROVIDER_NAME)/version-info.go
 
 BIN_DIRECTORY   = _bin
-# BIN_DIRECTORY = /usr/local/bin
 EXECUTABLE_NAME = terraform-provider-$(PROVIDER_NAME)
 DIST_ZIP_PREFIX = $(EXECUTABLE_NAME).v$(VERSION)
 

README.md

@@ -31,11 +31,16 @@ For more information, see the [provider documentation](docs/).
 
 ## Prerequisites
 
-Requires Terraform v0.8.x or newer (currently built against Terraform v0.11.x).
+Requires Terraform v0.12+ 
 
 ## Installing the provider
-
 Download the [latest release](https://github.com/DimensionDataResearch/dd-cloud-compute-terraform/releases/latest) and place the provider executable in the same directory as the main Terraform executable.
+Simply place terraform-provider-ddcloud binary on the same directory as terraform binary.
+
+## Using Terraform v0.13
+In terraform v0.13, the concept of registry namespace is introduced.
+To use in-house provider build, follow instructions below. 
+- Instruction to be provided
 
 ### Docker
 
@@ -63,9 +68,9 @@ Create a folder containing a single `.tf` file:
 
 provider "ddcloud" {
   # User name and password can also be specified via MCP_USER and MCP_PASSWORD environment variables.
-  "username"           = "my_username"
-  "password"           = "my_password" # Watch out for escaping if your password contains characters such as "$".
-  "region"             = "AU" # The DD compute region code (e.g. "AU", "NA", "EU")
+  username           = "my_username"
+  password           = "my_password" # Watch out for escaping if your password contains characters such as "$".
+  region             = "AU" # The DD compute region code (e.g. "AU", "NA", "EU")
 }
 
 resource "ddcloud_networkdomain" "my-domain" {
@@ -78,8 +83,8 @@ resource "ddcloud_vlan" "my-vlan" {
   name                 = "terraform-test-vlan"
   description          = "This is my Terraform test VLAN."
 
-  networkdomain        = "${ddcloud_networkdomain.my-domain.id}"
-
+  networkdomain        = ddcloud_networkdomain.my-domain.id
+  attached_vlan_gateway_addressing = "HIGH"
   # VLAN's default network: 192.168.17.1 -> 192.168.17.254 (netmask = 255.255.255.0)
   ipv4_base_address    = "192.168.17.0"
   ipv4_prefix_size     = 24
@@ -95,9 +100,9 @@ resource "ddcloud_server" "my-server" {
   memory_gb            = 8
   cpu_count            = 2
 
-  networkdomain        = "${ddcloud_networkdomain.my-domain.id}"
+  networkdomain        = ddcloud_networkdomain.my-domain.id
 
-  primary_network_adapter = {
+  primary_network_adapter {
     ipv4               = "192.168.17.10"
   }
 
@@ -123,8 +128,8 @@ resource "ddcloud_server" "my-server" {
 }
 
 resource "ddcloud_nat" "my-server-nat" {
-  networkdomain       = "${ddcloud_networkdomain.my-domain.id}"
-  private_ipv4        = "${ddcloud_server.my-server.primary_adapter_ipv4}"
+  networkdomain       = ddcloud_networkdomain.my-domain.id
+  private_ipv4        = ddcloud_server.my-server.primary_adapter_ipv4
 
   # public_ipv4 is computed at deploy time.
 
@@ -146,10 +151,10 @@ resource "ddcloud_firewall_rule" "my-vm-http-in" {
   # For a ddcloud_vlan, you can obtain these values using the ipv4_baseaddress and ipv4_prefixsize properties.
 
   # You can also specify destination_network or destination_address_list instead of source_address.
-  destination_address = "${ddcloud_nat.my-server-nat.public_ipv4}"
+  destination_address = ddcloud_nat.my-server-nat.public_ipv4
   destination_port    = "80"
 
-  networkdomain       = "${ddcloud_networkdomain.my-domain.id}"
+  networkdomain       = ddcloud_networkdomain.my-domain.id
 }
 ```
 

ddcloud/datasource_addresslist.go

@@ -2,8 +2,9 @@ package ddcloud
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform/helper/schema"
 	"log"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceAddressList() *schema.Resource {

ddcloud/datasource_networkdomain.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceNetworkDomain() *schema.Resource {

ddcloud/datasource_networkdomain_test.go

@@ -3,8 +3,8 @@ package ddcloud
 import (
 	"fmt"
 	"github.com/DimensionDataResearch/go-dd-cloud-compute/compute"
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 	"testing"
 )
 

ddcloud/datasource_pfx.go

@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"golang.org/x/crypto/pkcs12"
 )
 

ddcloud/datasource_vlan.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceVLAN() *schema.Resource {

ddcloud/provider.go

@@ -11,8 +11,8 @@ import (
 
 	"github.com/DimensionDataResearch/dd-cloud-compute-terraform/retry"
 	"github.com/DimensionDataResearch/go-dd-cloud-compute/compute"
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 // Provider creates the Dimension Data Cloud resource provider.
@@ -23,14 +23,12 @@ func Provider() terraform.ResourceProvider {
 			"region": &schema.Schema{
 				Type:          schema.TypeString,
 				Optional:      true,
-				Default:       "",
 				Description:   "The region code that identifies the target end-point for the Dimension Data CloudControl API.",
 				ConflictsWith: []string{"cloudcontrol_endpoint"},
 			},
 			"cloudcontrol_endpoint": &schema.Schema{
 				Type:          schema.TypeString,
 				Optional:      true,
-				Default:       "",
 				Description:   "The base URL of a custom target end-point for the Dimension Data CloudControl API.",
 				ConflictsWith: []string{"region"},
 			},
@@ -156,7 +154,7 @@ func Provider() terraform.ResourceProvider {
 // Returns the provider's compute API client.
 func configureProvider(providerSettings *schema.ResourceData) (interface{}, error) {
 	// Log provider version (for diagnostic purposes).
-	log.Print("ddcloud provider version is " + ProviderVersion)
+	// log.Print("ddcloud provider version is " + ProviderVersion)
 
 	log.Printf("ProviderSettings = %#v", providerSettings)