From 0156e4721329a915b97c55203519c6af878340fd Mon Sep 17 00:00:00 2001 From: hsahin Date: Thu, 10 Feb 2022 11:38:35 +0300 Subject: [PATCH] Revert "fix routing rule import order" This reverts commit 96f28e5f --- go.mod | 2 +- go.sum | 2 - opsgenie/provider.go | 3 +- .../resource_opsgenie_team_routing_rule.go | 4 +- .../opsgenie-go-sdk-v2/client/client.go | 2 +- .../opsgenie-go-sdk-v2/incident/incident.go | 9 ----- .../opsgenie-go-sdk-v2/incident/request.go | 38 ------------------- .../opsgenie-go-sdk-v2/team/result.go | 1 - vendor/modules.txt | 2 +- 9 files changed, 5 insertions(+), 58 deletions(-) diff --git a/go.mod b/go.mod index 92cba56c..0717b26d 100644 --- 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 index 646a1f3f..294e7b71 100644 --- 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 index 40384f71..8420199f 100644 --- 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 index 789ef2a4..d2d2c0ca 100644 --- 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 index 4f61d1ee..a83f9490 100644 --- a/vendor/github.com/opsgenie/opsgenie-go-sdk-v2/client/client.go +++ b/vendor/github.com/opsgenie/opsgenie-go-sdk-v2/client/client.go @@ -230,7 +230,7 @@ func setRetryPolicy(opsGenieClient *OpsGenieClient, cfg *Config) { } func NewOpsGenieClient(cfg *Config) (*OpsGenieClient, error) { - UserAgentHeader = fmt.Sprintf("opsgenie-go-sdk-%s %s (%s/%s)", Version, runtime.Version(), runtime.GOOS, runtime.GOARCH) + UserAgentHeader = fmt.Sprintf("opsgenie-go-sdk-%s %s (%s/%s) - Terraform", Version, runtime.Version(), runtime.GOOS, runtime.GOARCH) opsGenieClient := &OpsGenieClient{ Config: cfg, RetryableClient: retryablehttp.NewClient(), 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 index 214db30c..c5625fc2 100644 --- a/vendor/github.com/opsgenie/opsgenie-go-sdk-v2/incident/incident.go +++ b/vendor/github.com/opsgenie/opsgenie-go-sdk-v2/incident/incident.go @@ -62,15 +62,6 @@ func (c *Client) List(context context.Context, request *ListRequest) (*ListResul return result, nil } -func (c *Client) Resolve(context context.Context, request *ResolveRequest) (*AsyncResult, error) { - result := &AsyncResult{} - err := c.client.Exec(context, request, result) - if err != nil { - return nil, err - } - return result, nil -} - func (c *Client) Close(context context.Context, request *CloseRequest) (*AsyncResult, error) { result := &AsyncResult{} err := c.client.Exec(context, request, result) 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 index 8f878de3..3bfc6732 100644 --- a/vendor/github.com/opsgenie/opsgenie-go-sdk-v2/incident/request.go +++ b/vendor/github.com/opsgenie/opsgenie-go-sdk-v2/incident/request.go @@ -197,44 +197,6 @@ func (r *ListRequest) RequestParams() map[string]string { return params } -type ResolveRequest struct { - client.BaseRequest - Id string - Identifier IdentifierType - Note string `json:"note,omitempty"` -} - -func (r *ResolveRequest) Validate() error { - if r.Id == "" { - return errors.New("Incident ID cannot be blank.") - } - if r.Identifier != "" && r.Identifier != Id && r.Identifier != Tiny { - return errors.New("Identifier type should be one of these: 'Id', 'Tiny' or empty.") - } - return nil -} - -func (r *ResolveRequest) ResourcePath() string { - return "/v1/incidents/" + r.Id + "/resolve" -} - -func (r *ResolveRequest) Method() string { - return http.MethodPost -} - -func (r *ResolveRequest) RequestParams() map[string]string { - - params := make(map[string]string) - - if r.Identifier == Tiny { - params["identifierType"] = "tiny" - } else { - params["identifierType"] = "id" - } - - return params -} - type CloseRequest struct { client.BaseRequest Id string 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 index 0bb1d495..96be2135 100644 --- a/vendor/github.com/opsgenie/opsgenie-go-sdk-v2/team/result.go +++ b/vendor/github.com/opsgenie/opsgenie-go-sdk-v2/team/result.go @@ -19,7 +19,6 @@ type RoutingRuleMeta struct { Id string `json:"id,omitempty"` Name string `json:"name,omitempty"` IsDefault bool `json:"isDefault,omitempty"` - Order int `json:"order,omitempty"` Criteria og.Criteria `json:"criteria,omitempty"` Timezone string `json:"timezone,omitempty"` TimeRestriction og.TimeRestriction `json:"timeRestriction,omitempty"` diff --git a/vendor/modules.txt b/vendor/modules.txt index 1f4f09d4..54ff6404 100644 --- 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