Skip to content

Commit

Permalink
Update Go-Fastly dependency to 3.0.0 (#359)
Browse files Browse the repository at this point in the history
* switch to go-fastly 3.0.0

* update vendor via go mod vendor

* fix bugs in code due to go-fastly changes
  • Loading branch information
Integralist authored Jan 29, 2021
1 parent 98bbed6 commit 13d1c04
Show file tree
Hide file tree
Showing 195 changed files with 642 additions and 479 deletions.
8 changes: 4 additions & 4 deletions fastly/base_fastly_service_v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"log"
"time"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down Expand Up @@ -280,9 +280,9 @@ func resourceServiceUpdate(d *schema.ResourceData, meta interface{}, serviceDef
// Update Name and/or Comment. No new version is required for this.
if d.HasChange("name") || d.HasChange("comment") {
_, err := conn.UpdateService(&gofastly.UpdateServiceInput{
ID: d.Id(),
Name: gofastly.String(d.Get("name").(string)),
Comment: gofastly.String(d.Get("comment").(string)),
ServiceID: d.Id(),
Name: gofastly.String(d.Get("name").(string)),
Comment: gofastly.String(d.Get("comment").(string)),
})
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_acl.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_acl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"strings"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_bigquerylogging.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_bigquerylogging_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"reflect"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_blobstoragelogging.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_blobstoragelogging_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"reflect"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_cachesetting.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"strings"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_cachesetting_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_condition.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"strings"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_condition_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_dictionary.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_dictionary_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_director.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_director_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_domain.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_dynamicsnippet.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"strings"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_dynamicsnippet_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_gcslogging.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_gcslogging_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"reflect"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_gzip.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"strings"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_gzip_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_header.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"strings"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_header_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_healthcheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_healthcheck_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_httpslogging.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
)
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_httpslogging_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"reflect"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_logentries.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_logentries_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"reflect"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_logging_cloudfiles.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_logging_cloudfiles_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/google/go-cmp/cmp"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_logging_datadog.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_logging_datadog_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/google/go-cmp/cmp"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_logging_digitalocean.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/google/go-cmp/cmp"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_logging_elasticsearch.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"testing"

fst "github.com/fastly/go-fastly/v2/fastly"
fst "github.com/fastly/go-fastly/v3/fastly"
"github.com/google/go-cmp/cmp"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_logging_ftp.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_logging_ftp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/google/go-cmp/cmp"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
Expand Down
2 changes: 1 addition & 1 deletion fastly/block_fastly_service_v1_logging_googlepubsub.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"reflect"
"testing"

gofastly "github.com/fastly/go-fastly/v2/fastly"
gofastly "github.com/fastly/go-fastly/v3/fastly"
"github.com/google/go-cmp/cmp"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
Expand Down
Loading

0 comments on commit 13d1c04

Please sign in to comment.