Revert "fix routing rule import order"

This reverts commit 96f28e5
opsgenie · Feb 10, 2022 · 0156e47 · 0156e47
1 parent 96f28e5
commit 0156e47
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 58 deletions.
diff --git a/go.mod b/go.mod
@@ -5,6 +5,6 @@ go 1.16
 require (
 	github.com/hashicorp/go-retryablehttp v0.6.6
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.0
-	github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.11-0.20220210080402-2a8f79978ae0
+	github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.9-0.20220105104804-b14b16d483ab
 	github.com/pkg/errors v0.9.1
 )
diff --git a/go.sum b/go.sum
@@ -283,8 +283,6 @@ github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.8 h1:qF/rRi8GSU2mjBXfJIyMj9GGmjedsV3
 github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.8/go.mod h1:4OjcxgwdXzezqytxN534MooNmrxRD50geWZxTD7845s=
 github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.9-0.20220105104804-b14b16d483ab h1:7fzAUOMkb+SuhUsKbBrr8KOxmGWTtPTt2fqL+RcqGUA=
 github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.9-0.20220105104804-b14b16d483ab/go.mod h1:4OjcxgwdXzezqytxN534MooNmrxRD50geWZxTD7845s=
-github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.11-0.20220210080402-2a8f79978ae0 h1:qlSiuCdXCgw/fwoQA+SV2Ek3peiq6G9cR9meP1Ux8Ys=
-github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.11-0.20220210080402-2a8f79978ae0/go.mod h1:4OjcxgwdXzezqytxN534MooNmrxRD50geWZxTD7845s=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

diff --git a/opsgenie/provider.go b/opsgenie/provider.go
@@ -2,9 +2,8 @@ package opsgenie
 
 import (
 	"context"
-	"log"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"log"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )

diff --git a/opsgenie/resource_opsgenie_team_routing_rule.go b/opsgenie/resource_opsgenie_team_routing_rule.go
@@ -3,11 +3,10 @@ package opsgenie
 import (
 	"context"
 	"fmt"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"log"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-
 	"github.com/opsgenie/opsgenie-go-sdk-v2/og"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -257,7 +256,6 @@ func resourceOpsGenieTeamRoutingRuleRead(d *schema.ResourceData, meta interface{
 	}
 	d.Set("is_default", result.IsDefault)
 	d.Set("name", result.Name)
-	d.Set("order", result.Order)
 	d.Set("time_restriction", flattenOpsgenieTimeRestriction(result.TimeRestriction))
 	d.Set("notify", flattenOpsgenieNotify(result.Notify))
 	d.Set("criteria", flattenOpsgenieCriteria(result.Criteria))

diff --git a/vendor/github.com/opsgenie/opsgenie-go-sdk-v2/client/client.go b/vendor/github.com/opsgenie/opsgenie-go-sdk-v2/client/client.go
diff --git a/vendor/github.com/opsgenie/opsgenie-go-sdk-v2/incident/incident.go b/vendor/github.com/opsgenie/opsgenie-go-sdk-v2/incident/incident.go
diff --git a/vendor/github.com/opsgenie/opsgenie-go-sdk-v2/incident/request.go b/vendor/github.com/opsgenie/opsgenie-go-sdk-v2/incident/request.go
diff --git a/vendor/github.com/opsgenie/opsgenie-go-sdk-v2/team/result.go b/vendor/github.com/opsgenie/opsgenie-go-sdk-v2/team/result.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -137,7 +137,7 @@ github.com/mitchellh/mapstructure
 github.com/mitchellh/reflectwalk
 # github.com/oklog/run v1.0.0
 github.com/oklog/run
-# github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.11-0.20220210080402-2a8f79978ae0
+# github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.9-0.20220105104804-b14b16d483ab
 ## explicit
 github.com/opsgenie/opsgenie-go-sdk-v2/alert
 github.com/opsgenie/opsgenie-go-sdk-v2/client