Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 4b31b7262be8dd57994ff936662dbebd03073ae2
Author: Gunter Grodotzki <gunter.grodotzki@tidal.com>
Date:   Fri Sep 18 14:01:14 2020 +0200

    Squashed commit of the following:

    commit 5634bb9
    Author: Gunter Grodotzki <gunter.grodotzki@tidal.com>
    Date:   Fri Sep 18 14:00:15 2020 +0200

        Squashed commit of the following:

        commit 35ebf55
        Author: Gunter Grodotzki <gunter.grodotzki@tidal.com>
        Date:   Fri Sep 18 13:59:25 2020 +0200

            bumb sdk

commit 9189ab3
Author: Bishwa Shrestha <bishwa.shrestha@tidal.com>
Date:   Mon Sep 14 23:49:49 2020 +0200

    Publish on v* tag

commit 7a9ed84
Author: Bishwa Shrestha <bishwa.shrestha@tidal.com>
Date:   Mon Sep 14 23:26:12 2020 +0200

    goreleaser changes

commit 3388675
Author: Bishwa Shrestha <bishwa.shrestha@tidal.com>
Date:   Mon Sep 14 22:03:18 2020 +0200

    changelog

commit 2392c9c
Merge: e857b66 4f707e3
Author: Bishwa Shrestha <bishwa.shrestha@gmail.com>
Date:   Mon Sep 14 21:55:52 2020 +0200

    Merge pull request #1 from tidal-engineering/github_workflows

    Goreleaser + GH workflows

commit 4f707e3
Author: Bishwa Shrestha <bishwa.shrestha@tidal.com>
Date:   Mon Sep 14 21:53:17 2020 +0200

    Separate workflows for branches and tags

commit de1f6e9
Author: Bishwa Shrestha <bishwa.shrestha@tidal.com>
Date:   Mon Sep 14 21:28:42 2020 +0200

    terraform registry scaffolding

commit bbe2fbb
Author: Bishwa Shrestha <bishwa.shrestha@tidal.com>
Date:   Mon Sep 14 16:34:10 2020 +0200

    PR builds

commit 3c50f42
Author: Bishwa Shrestha <bishwa.shrestha@tidal.com>
Date:   Mon Sep 14 16:12:18 2020 +0200

    Goreleaser + GH workflows

commit e857b66
Author: Paul Rondeau <paulrondeau07@gmail.com>
Date:   Tue Jan 14 06:04:11 2020 -0800

    added dash to allowable application name regex (armory-io#41)

commit d503979
Author: Damian Myerscough <dmyerscough@users.noreply.github.com>
Date:   Thu Nov 28 14:40:59 2019 -0800

    Fix Terraform syntax (armory-io#34)

commit 2559f91
Author: Damian Myerscough <dmyerscough@users.noreply.github.com>
Date:   Thu Nov 28 14:40:08 2019 -0800

    Fix Apache Thrift location (armory-io#33)

commit 73e60f5
Author: Bishwa Shrestha <bishwa.shrestha@gmail.com>
Date:   Thu Nov 28 23:37:44 2019 +0100

    Add validation for spinnaker application name (armory-io#37)
  • Loading branch information
Gunter Grodotzki committed Sep 18, 2020
1 parent 9189ab3 commit d478898
Show file tree
Hide file tree
Showing 11 changed files with 145 additions and 321 deletions.
9 changes: 4 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
module github.com/armory-io/terraform-provider-spinnaker
module github.com/tidal-engineering/terraform-provider-spinnaker

go 1.12
go 1.14

require (
cloud.google.com/go v0.37.4 // indirect
github.com/ghodss/yaml v1.0.0
github.com/hashicorp/terraform v0.12.0
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
github.com/hashicorp/terraform-plugin-sdk v1.7.0
github.com/mitchellh/mapstructure v1.1.2
github.com/spf13/pflag v1.0.3
github.com/spinnaker/spin v0.0.0-20190530150642-535d2dc1b985
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
)

replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
416 changes: 120 additions & 296 deletions go.sum

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package main

import (
"github.com/armory-io/terraform-provider-spinnaker/spinnaker"
"github.com/hashicorp/terraform/plugin"
"github.com/hashicorp/terraform/terraform"
"github.com/tidal-engineering/terraform-provider-spinnaker/spinnaker"
"github.com/hashicorp/terraform-plugin-sdk/plugin"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion spinnaker/datasource_pipeline.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package spinnaker

import (
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

func datasourcePipeline() *schema.Resource {
Expand Down
5 changes: 3 additions & 2 deletions spinnaker/provider.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package spinnaker

import (
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
"github.com/spf13/pflag"
gate "github.com/spinnaker/spin/cmd/gateclient"
)

func Provider() *schema.Provider {
func Provider() terraform.ResourceProvider {
return &schema.Provider{
Schema: map[string]*schema.Schema{
"server": {
Expand Down
6 changes: 3 additions & 3 deletions spinnaker/provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"os"
"testing"

"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"
)

var testAccProviders map[string]terraform.ResourceProvider
Expand All @@ -22,7 +22,7 @@ func testAccPreCheck(t *testing.T) {
if os.Getenv("GATE_URL") == "" {
t.Fatal("GATE_URL must be set for acceptance tests")
}
err := testAccProvider.Configure(terraform.NewResourceConfig(nil))
err := testAccProvider.Configure(terraform.NewResourceConfigRaw(nil))
if err != nil {
t.Fatalf("err: %s", err)
}
Expand Down
4 changes: 2 additions & 2 deletions spinnaker/resource_application.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package spinnaker
import (
"strings"

"github.com/armory-io/terraform-provider-spinnaker/spinnaker/api"
"github.com/hashicorp/terraform/helper/schema"
"github.com/tidal-engineering/terraform-provider-spinnaker/spinnaker/api"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

func resourceApplication() *schema.Resource {
Expand Down
6 changes: 3 additions & 3 deletions spinnaker/resource_application_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"testing"
"time"

"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
)

func TestAccSpinnakerApplication_basic(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions spinnaker/resource_pipeline.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"strings"

"github.com/armory-io/terraform-provider-spinnaker/spinnaker/api"
"github.com/hashicorp/terraform/helper/schema"
"github.com/tidal-engineering/terraform-provider-spinnaker/spinnaker/api"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

func resourcePipeline() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions spinnaker/resource_pipeline_template.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"log"
"reflect"

"github.com/armory-io/terraform-provider-spinnaker/spinnaker/api"
"github.com/tidal-engineering/terraform-provider-spinnaker/spinnaker/api"
"github.com/ghodss/yaml"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

func resourcePipelineTemplate() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions spinnaker/resource_pipeline_template_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"fmt"
"log"

"github.com/armory-io/terraform-provider-spinnaker/spinnaker/api"
"github.com/tidal-engineering/terraform-provider-spinnaker/spinnaker/api"
"github.com/ghodss/yaml"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

type PipelineConfig struct {
Expand Down

0 comments on commit d478898

Please sign in to comment.