* update terraform release.yml (#77)

* update terraform goreleaser
* fix origin proto on res creation
* update default values for 'custom_values' option & 'secondary_hostnames'

Co-authored-by: Vitaly Velikodny <[email protected]>

Author: vvelikodny

.github/workflows/release.yml

@@ -1,7 +1,7 @@
 # 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
+# This uses an action (hashicorp/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.
@@ -20,7 +20,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.4.0
       -
         name: Unshallow
         run: git fetch --prune --unshallow
@@ -32,20 +32,18 @@ jobs:
       -
         name: Import GPG key
         id: import_gpg
-        # TODO: move this to HashiCorp namespace or find alternative that is just simple gpg commands
-        # see https://github.com/hashicorp/terraform-provider-scaffolding/issues/22
-        uses: paultyng/[email protected]
+        uses: hashicorp/[email protected]
         env:
           # These secrets will need to be configured for the repository:
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
           PASSPHRASE: ${{ secrets.PASSPHRASE }}
       -
         name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v2.8.1
         with:
           version: latest
           args: release --rm-dist
         env:
           GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
           # GitHub sets this automatically
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.goreleaser.yml

@@ -33,6 +33,9 @@ archives:
   - format: zip
     name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
 checksum:
+  extra_files:
+    - glob: 'terraform-registry-manifest.json'
+      name_template: '{{ .ProjectName }}_{{ .Version }}_manifest.json'
   name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS'
   algorithm: sha256
 signs:
@@ -48,7 +51,10 @@ signs:
       - "--detach-sign"
       - "${artifact}"
 release:
-# If you want to manually examine the release before its live, uncomment this line:
-# draft: true
+  extra_files:
+    - glob: 'terraform-registry-manifest.json'
+      name_template: '{{ .ProjectName }}_{{ .Version }}_manifest.json'
+  # If you want to manually examine the release before its live, uncomment this line:
+  # draft: true
 changelog:
   skip: true

gcore/resource_gcore_cdn_resource.go

@@ -46,8 +46,12 @@ var (
 								Description: "Content will be cached according to origin cache settings. The value applies for a response with codes 200, 201, 204, 206, 301, 302, 303, 304, 307, 308 if an origin server does not have caching HTTP headers. Responses with other codes will not be cached.",
 							},
 							"custom_values": {
-								Type:        schema.TypeMap,
-								Optional:    true,
+								Type:     schema.TypeMap,
+								Optional: true,
+								Computed: true,
+								DefaultFunc: func() (interface{}, error) {
+									return map[string]interface{}{}, nil
+								},
 								Elem:        schema.TypeString,
 								Description: "Caching time for a response with specific codes. These settings have a higher priority than the value field. Response code ('304', '404' for example). Use 'any' to specify caching time for all response codes. Caching time in seconds ('0s', '600s' for example). Use '0s' to disable caching for a specific response code.",
 							},
@@ -278,8 +282,12 @@ func resourceCDNResource() *schema.Resource {
 				Description: "This option defines the protocol that will be used by CDN servers to request content from an origin source. If not specified, we will use HTTP to connect to an origin server. Possible values are: HTTPS, HTTP, MATCH.",
 			},
 			"secondary_hostnames": {
-				Type:        schema.TypeSet,
-				Optional:    true,
+				Type:     schema.TypeSet,
+				Optional: true,
+				Computed: true,
+				DefaultFunc: func() (interface{}, error) {
+					return []string{}, nil
+				},
 				Elem:        &schema.Schema{Type: schema.TypeString},
 				Description: "List of additional CNAMEs.",
 			},
@@ -325,6 +333,7 @@ func resourceCDNResourceCreate(ctx context.Context, d *schema.ResourceData, m in
 	req.Description = d.Get("description").(string)
 	req.Origin = d.Get("origin").(string)
 	req.OriginGroup = d.Get("origin_group").(int)
+	req.OriginProtocol = resources.Protocol(d.Get("origin_protocol").(string))
 
 	req.Options = listToOptions(d.Get("options").([]interface{}))
 

go.mod

@@ -5,7 +5,7 @@ go 1.16
 require (
 	github.com/G-Core/g-dns-sdk-go v0.1.2
 	github.com/G-Core/gcorelabs-storage-sdk-go v0.0.9
-	github.com/G-Core/gcorelabscdn-go v0.1.8
+	github.com/G-Core/gcorelabscdn-go v0.1.9
 	github.com/G-Core/gcorelabscloud-go v0.4.42
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/terraform-exec v0.15.0 // indirect

go.sum

@@ -57,6 +57,8 @@ github.com/G-Core/gcorelabscdn-go v0.1.7 h1:NFupXalEcAi0lvTH054vhD7taNn8hHEovT60
 github.com/G-Core/gcorelabscdn-go v0.1.7/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
 github.com/G-Core/gcorelabscdn-go v0.1.8 h1:cP6a3YMN73mRqISMIPWFJ5YVnvPiLjQn1I97l7xkRVk=
 github.com/G-Core/gcorelabscdn-go v0.1.8/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
+github.com/G-Core/gcorelabscdn-go v0.1.9 h1:ysx/MPSVlfsPvWMorxVxZW7Ow7uM6WNkA3voHw5Sd54=
+github.com/G-Core/gcorelabscdn-go v0.1.9/go.mod h1:iSGXaTvZBzDHQW+rKFS918BgFVpONcyLEijwh8WsXpE=
 github.com/G-Core/gcorelabscloud-go v0.4.42 h1:LBH4GnH82eQ5L/Lfnzm8KJovbIHPzt2KMitVN1V9kDQ=
 github.com/G-Core/gcorelabscloud-go v0.4.42/go.mod h1:Z1MF80mWagEUrxygtYkvW/MJEYNmIUPsIEYBB3cKjOM=
 github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=