From bab48cb6d6f110d0fbd4b2a478d5a3cff92e9360 Mon Sep 17 00:00:00 2001 From: "Ian C. Ward" Date: Thu, 23 Aug 2018 14:59:54 -0400 Subject: [PATCH] Update client to v2.11.0 Release Also switched from gopkg to retrieving package directly from github.com Updating the client is pre-work prior to addressing #76 --- datadog/config.go | 2 +- datadog/resource_datadog_downtime.go | 2 +- datadog/resource_datadog_downtime_test.go | 2 +- datadog/resource_datadog_metric_metadata.go | 2 +- .../resource_datadog_metric_metadata_test.go | 2 +- datadog/resource_datadog_monitor.go | 2 +- datadog/resource_datadog_monitor_test.go | 2 +- datadog/resource_datadog_timeboard.go | 2 +- datadog/resource_datadog_timeboard_test.go | 2 +- datadog/resource_datadog_user.go | 2 +- datadog/resource_datadog_user_test.go | 2 +- .../zorkian/go-datadog-api}/LICENSE | 0 .../zorkian/go-datadog-api}/Makefile | 0 .../zorkian/go-datadog-api}/README.md | 0 .../zorkian/go-datadog-api}/alerts.go | 0 .../zorkian/go-datadog-api}/checks.go | 0 .../zorkian/go-datadog-api}/client.go | 0 .../zorkian/go-datadog-api}/comments.go | 0 .../go-datadog-api}/dashboard_lists.go | 0 .../zorkian/go-datadog-api}/dashboards.go | 0 .../go-datadog-api}/datadog-accessors.go | 124 ++++++++++++++++++ .../zorkian/go-datadog-api}/downtimes.go | 0 .../zorkian/go-datadog-api}/events.go | 0 .../zorkian/go-datadog-api}/generate.go | 0 .../zorkian/go-datadog-api}/helpers.go | 0 .../zorkian/go-datadog-api}/hosts.go | 0 .../zorkian/go-datadog-api}/integrations.go | 60 ++++++++- .../go-datadog-api}/metric_metadata.go | 0 .../zorkian/go-datadog-api}/monitors.go | 0 .../zorkian/go-datadog-api}/request.go | 0 .../zorkian/go-datadog-api}/screen_widgets.go | 0 .../zorkian/go-datadog-api}/screenboards.go | 2 +- .../zorkian/go-datadog-api}/search.go | 0 .../zorkian/go-datadog-api}/series.go | 0 .../zorkian/go-datadog-api}/snapshot.go | 0 .../zorkian/go-datadog-api}/tags.go | 0 .../zorkian/go-datadog-api}/users.go | 0 vendor/vendor.json | 14 +- 38 files changed, 202 insertions(+), 20 deletions(-) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/LICENSE (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/Makefile (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/README.md (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/alerts.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/checks.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/client.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/comments.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/dashboard_lists.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/dashboards.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/datadog-accessors.go (98%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/downtimes.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/events.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/generate.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/helpers.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/hosts.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/integrations.go (66%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/metric_metadata.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/monitors.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/request.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/screen_widgets.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/screenboards.go (98%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/search.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/series.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/snapshot.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/tags.go (100%) rename vendor/{gopkg.in/zorkian/go-datadog-api.v2 => github.com/zorkian/go-datadog-api}/users.go (100%) diff --git a/datadog/config.go b/datadog/config.go index cc84bb690..904ea5de7 100644 --- a/datadog/config.go +++ b/datadog/config.go @@ -3,7 +3,7 @@ package datadog import ( "log" - "gopkg.in/zorkian/go-datadog-api.v2" + "github.com/zorkian/go-datadog-api" ) // Config holds API and APP keys to authenticate to Datadog. diff --git a/datadog/resource_datadog_downtime.go b/datadog/resource_datadog_downtime.go index 323b2dc12..6fd0090bb 100644 --- a/datadog/resource_datadog_downtime.go +++ b/datadog/resource_datadog_downtime.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/hashicorp/terraform/helper/schema" - "gopkg.in/zorkian/go-datadog-api.v2" + "github.com/zorkian/go-datadog-api" ) func resourceDatadogDowntime() *schema.Resource { diff --git a/datadog/resource_datadog_downtime_test.go b/datadog/resource_datadog_downtime_test.go index 35838bd93..01d74592d 100644 --- a/datadog/resource_datadog_downtime_test.go +++ b/datadog/resource_datadog_downtime_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "gopkg.in/zorkian/go-datadog-api.v2" + "github.com/zorkian/go-datadog-api" ) func TestAccDatadogDowntime_Basic(t *testing.T) { diff --git a/datadog/resource_datadog_metric_metadata.go b/datadog/resource_datadog_metric_metadata.go index 4c2f0d3b0..b6aee5195 100644 --- a/datadog/resource_datadog_metric_metadata.go +++ b/datadog/resource_datadog_metric_metadata.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - datadog "gopkg.in/zorkian/go-datadog-api.v2" + "github.com/zorkian/go-datadog-api" "github.com/hashicorp/terraform/helper/schema" ) diff --git a/datadog/resource_datadog_metric_metadata_test.go b/datadog/resource_datadog_metric_metadata_test.go index 18cd56be9..2386a5b02 100644 --- a/datadog/resource_datadog_metric_metadata_test.go +++ b/datadog/resource_datadog_metric_metadata_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - datadog "gopkg.in/zorkian/go-datadog-api.v2" + "github.com/zorkian/go-datadog-api" ) func TestAccDatadogMetricMetadata_Basic(t *testing.T) { diff --git a/datadog/resource_datadog_monitor.go b/datadog/resource_datadog_monitor.go index 8b6cafb29..409c8b3a9 100644 --- a/datadog/resource_datadog_monitor.go +++ b/datadog/resource_datadog_monitor.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/hashicorp/terraform/helper/schema" - "gopkg.in/zorkian/go-datadog-api.v2" + "github.com/zorkian/go-datadog-api" ) func resourceDatadogMonitor() *schema.Resource { diff --git a/datadog/resource_datadog_monitor_test.go b/datadog/resource_datadog_monitor_test.go index 4379cdfcf..40b3a42cd 100644 --- a/datadog/resource_datadog_monitor_test.go +++ b/datadog/resource_datadog_monitor_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "gopkg.in/zorkian/go-datadog-api.v2" + "github.com/zorkian/go-datadog-api" ) func TestAccDatadogMonitor_Basic(t *testing.T) { diff --git a/datadog/resource_datadog_timeboard.go b/datadog/resource_datadog_timeboard.go index d0b02c32b..e238ca8f9 100644 --- a/datadog/resource_datadog_timeboard.go +++ b/datadog/resource_datadog_timeboard.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/kr/pretty" - "gopkg.in/zorkian/go-datadog-api.v2" + "github.com/zorkian/go-datadog-api" ) func resourceDatadogTimeboard() *schema.Resource { diff --git a/datadog/resource_datadog_timeboard_test.go b/datadog/resource_datadog_timeboard_test.go index 3673b9506..ec3e3465b 100644 --- a/datadog/resource_datadog_timeboard_test.go +++ b/datadog/resource_datadog_timeboard_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "gopkg.in/zorkian/go-datadog-api.v2" + "github.com/zorkian/go-datadog-api" ) const config1 = ` diff --git a/datadog/resource_datadog_user.go b/datadog/resource_datadog_user.go index b7c73035d..c74bc992a 100644 --- a/datadog/resource_datadog_user.go +++ b/datadog/resource_datadog_user.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/hashicorp/terraform/helper/schema" - "gopkg.in/zorkian/go-datadog-api.v2" + "github.com/zorkian/go-datadog-api" ) func resourceDatadogUser() *schema.Resource { diff --git a/datadog/resource_datadog_user_test.go b/datadog/resource_datadog_user_test.go index cdda12721..1171b8a03 100644 --- a/datadog/resource_datadog_user_test.go +++ b/datadog/resource_datadog_user_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" - "gopkg.in/zorkian/go-datadog-api.v2" + "github.com/zorkian/go-datadog-api" ) func TestAccDatadogUser_Updated(t *testing.T) { diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/LICENSE b/vendor/github.com/zorkian/go-datadog-api/LICENSE similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/LICENSE rename to vendor/github.com/zorkian/go-datadog-api/LICENSE diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/Makefile b/vendor/github.com/zorkian/go-datadog-api/Makefile similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/Makefile rename to vendor/github.com/zorkian/go-datadog-api/Makefile diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/README.md b/vendor/github.com/zorkian/go-datadog-api/README.md similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/README.md rename to vendor/github.com/zorkian/go-datadog-api/README.md diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/alerts.go b/vendor/github.com/zorkian/go-datadog-api/alerts.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/alerts.go rename to vendor/github.com/zorkian/go-datadog-api/alerts.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/checks.go b/vendor/github.com/zorkian/go-datadog-api/checks.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/checks.go rename to vendor/github.com/zorkian/go-datadog-api/checks.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/client.go b/vendor/github.com/zorkian/go-datadog-api/client.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/client.go rename to vendor/github.com/zorkian/go-datadog-api/client.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/comments.go b/vendor/github.com/zorkian/go-datadog-api/comments.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/comments.go rename to vendor/github.com/zorkian/go-datadog-api/comments.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/dashboard_lists.go b/vendor/github.com/zorkian/go-datadog-api/dashboard_lists.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/dashboard_lists.go rename to vendor/github.com/zorkian/go-datadog-api/dashboard_lists.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/dashboards.go b/vendor/github.com/zorkian/go-datadog-api/dashboards.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/dashboards.go rename to vendor/github.com/zorkian/go-datadog-api/dashboards.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/datadog-accessors.go b/vendor/github.com/zorkian/go-datadog-api/datadog-accessors.go similarity index 98% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/datadog-accessors.go rename to vendor/github.com/zorkian/go-datadog-api/datadog-accessors.go index faa44e5d0..859417289 100644 --- a/vendor/gopkg.in/zorkian/go-datadog-api.v2/datadog-accessors.go +++ b/vendor/github.com/zorkian/go-datadog-api/datadog-accessors.go @@ -7453,6 +7453,130 @@ func (i *ImageWidget) SetY(v int) { i.Y = &v } +// GetAccountID returns the AccountID field if non-nil, zero value otherwise. +func (i *IntegrationAWSAccount) GetAccountID() string { + if i == nil || i.AccountID == nil { + return "" + } + return *i.AccountID +} + +// GetOkAccountID returns a tuple with the AccountID field if it's non-nil, zero value otherwise +// and a boolean to check if the value has been set. +func (i *IntegrationAWSAccount) GetAccountIDOk() (string, bool) { + if i == nil || i.AccountID == nil { + return "", false + } + return *i.AccountID, true +} + +// HasAccountID returns a boolean if a field has been set. +func (i *IntegrationAWSAccount) HasAccountID() bool { + if i != nil && i.AccountID != nil { + return true + } + + return false +} + +// SetAccountID allocates a new i.AccountID and returns the pointer to it. +func (i *IntegrationAWSAccount) SetAccountID(v string) { + i.AccountID = &v +} + +// GetRoleName returns the RoleName field if non-nil, zero value otherwise. +func (i *IntegrationAWSAccount) GetRoleName() string { + if i == nil || i.RoleName == nil { + return "" + } + return *i.RoleName +} + +// GetOkRoleName returns a tuple with the RoleName field if it's non-nil, zero value otherwise +// and a boolean to check if the value has been set. +func (i *IntegrationAWSAccount) GetRoleNameOk() (string, bool) { + if i == nil || i.RoleName == nil { + return "", false + } + return *i.RoleName, true +} + +// HasRoleName returns a boolean if a field has been set. +func (i *IntegrationAWSAccount) HasRoleName() bool { + if i != nil && i.RoleName != nil { + return true + } + + return false +} + +// SetRoleName allocates a new i.RoleName and returns the pointer to it. +func (i *IntegrationAWSAccount) SetRoleName(v string) { + i.RoleName = &v +} + +// GetAccountID returns the AccountID field if non-nil, zero value otherwise. +func (i *IntegrationAWSAccountDeleteRequest) GetAccountID() string { + if i == nil || i.AccountID == nil { + return "" + } + return *i.AccountID +} + +// GetOkAccountID returns a tuple with the AccountID field if it's non-nil, zero value otherwise +// and a boolean to check if the value has been set. +func (i *IntegrationAWSAccountDeleteRequest) GetAccountIDOk() (string, bool) { + if i == nil || i.AccountID == nil { + return "", false + } + return *i.AccountID, true +} + +// HasAccountID returns a boolean if a field has been set. +func (i *IntegrationAWSAccountDeleteRequest) HasAccountID() bool { + if i != nil && i.AccountID != nil { + return true + } + + return false +} + +// SetAccountID allocates a new i.AccountID and returns the pointer to it. +func (i *IntegrationAWSAccountDeleteRequest) SetAccountID(v string) { + i.AccountID = &v +} + +// GetRoleName returns the RoleName field if non-nil, zero value otherwise. +func (i *IntegrationAWSAccountDeleteRequest) GetRoleName() string { + if i == nil || i.RoleName == nil { + return "" + } + return *i.RoleName +} + +// GetOkRoleName returns a tuple with the RoleName field if it's non-nil, zero value otherwise +// and a boolean to check if the value has been set. +func (i *IntegrationAWSAccountDeleteRequest) GetRoleNameOk() (string, bool) { + if i == nil || i.RoleName == nil { + return "", false + } + return *i.RoleName, true +} + +// HasRoleName returns a boolean if a field has been set. +func (i *IntegrationAWSAccountDeleteRequest) HasRoleName() bool { + if i != nil && i.RoleName != nil { + return true + } + + return false +} + +// SetRoleName allocates a new i.RoleName and returns the pointer to it. +func (i *IntegrationAWSAccountDeleteRequest) SetRoleName(v string) { + i.RoleName = &v +} + // GetAPIToken returns the APIToken field if non-nil, zero value otherwise. func (i *integrationPD) GetAPIToken() string { if i == nil || i.APIToken == nil { diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/downtimes.go b/vendor/github.com/zorkian/go-datadog-api/downtimes.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/downtimes.go rename to vendor/github.com/zorkian/go-datadog-api/downtimes.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/events.go b/vendor/github.com/zorkian/go-datadog-api/events.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/events.go rename to vendor/github.com/zorkian/go-datadog-api/events.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/generate.go b/vendor/github.com/zorkian/go-datadog-api/generate.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/generate.go rename to vendor/github.com/zorkian/go-datadog-api/generate.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/helpers.go b/vendor/github.com/zorkian/go-datadog-api/helpers.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/helpers.go rename to vendor/github.com/zorkian/go-datadog-api/helpers.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/hosts.go b/vendor/github.com/zorkian/go-datadog-api/hosts.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/hosts.go rename to vendor/github.com/zorkian/go-datadog-api/hosts.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/integrations.go b/vendor/github.com/zorkian/go-datadog-api/integrations.go similarity index 66% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/integrations.go rename to vendor/github.com/zorkian/go-datadog-api/integrations.go index 79f0c6c43..c3ed2f4e5 100644 --- a/vendor/gopkg.in/zorkian/go-datadog-api.v2/integrations.go +++ b/vendor/github.com/zorkian/go-datadog-api/integrations.go @@ -13,8 +13,8 @@ package datadog */ type servicePD struct { - ServiceName *string `json:"service"` - ServiceKey *string `json:"key"` + ServiceName *string `json:"service_name"` + ServiceKey *string `json:"service_key"` } type integrationPD struct { @@ -120,3 +120,59 @@ func (client *Client) GetIntegrationSlack() (*IntegrationSlackRequest, error) { func (client *Client) DeleteIntegrationSlack() error { return client.doJsonRequest("DELETE", "/v1/integration/slack", nil, nil) } + +/* + AWS Integration +*/ + +// IntegrationAWSAccount defines the request payload for +// creating & updating Datadog-AWS integration. +type IntegrationAWSAccount struct { + AccountID *string `json:"account_id"` + RoleName *string `json:"role_name"` + FilterTags []string `json:"filter_tags"` + HostTags []string `json:"host_tags"` + AccountSpecificNamespaceRules map[string]bool `json:"account_specific_namespace_rules"` +} + +// IntegrationAWSAccountCreateResponse defines the response payload for +// creating & updating Datadog-AWS integration. +type IntegrationAWSAccountCreateResponse struct { + ExternalID string `json:"external_id"` +} + +type IntegrationAWSAccountGetResponse struct { + Accounts []IntegrationAWSAccount `json:"accounts"` +} + +type IntegrationAWSAccountDeleteRequest struct { + AccountID *string `json:"account_id"` + RoleName *string `json:"role_name"` +} + +// CreateIntegrationAWS adds a new AWS Account in the AWS Integrations. +// Use this if you want to setup the integration for the first time +// or to add more accounts. +func (client *Client) CreateIntegrationAWS(awsAccount *IntegrationAWSAccount) (*IntegrationAWSAccountCreateResponse, error) { + var out IntegrationAWSAccountCreateResponse + if err := client.doJsonRequest("POST", "/v1/integration/aws", awsAccount, &out); err != nil { + return nil, err + } + + return &out, nil +} + +// GetIntegrationAWS gets all the AWS Accounts in the AWS Integrations from Datadog. +func (client *Client) GetIntegrationAWS() (*[]IntegrationAWSAccount, error) { + var response IntegrationAWSAccountGetResponse + if err := client.doJsonRequest("GET", "/v1/integration/aws", nil, &response); err != nil { + return nil, err + } + + return &response.Accounts, nil +} + +// DeleteIntegrationAWS removes a specific AWS Account from the AWS Integration. +func (client *Client) DeleteIntegrationAWS(awsAccount *IntegrationAWSAccountDeleteRequest) error { + return client.doJsonRequest("DELETE", "/v1/integration/aws", awsAccount, nil) +} diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/metric_metadata.go b/vendor/github.com/zorkian/go-datadog-api/metric_metadata.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/metric_metadata.go rename to vendor/github.com/zorkian/go-datadog-api/metric_metadata.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/monitors.go b/vendor/github.com/zorkian/go-datadog-api/monitors.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/monitors.go rename to vendor/github.com/zorkian/go-datadog-api/monitors.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/request.go b/vendor/github.com/zorkian/go-datadog-api/request.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/request.go rename to vendor/github.com/zorkian/go-datadog-api/request.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/screen_widgets.go b/vendor/github.com/zorkian/go-datadog-api/screen_widgets.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/screen_widgets.go rename to vendor/github.com/zorkian/go-datadog-api/screen_widgets.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/screenboards.go b/vendor/github.com/zorkian/go-datadog-api/screenboards.go similarity index 98% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/screenboards.go rename to vendor/github.com/zorkian/go-datadog-api/screenboards.go index 0af99eafc..2866fd58c 100644 --- a/vendor/gopkg.in/zorkian/go-datadog-api.v2/screenboards.go +++ b/vendor/github.com/zorkian/go-datadog-api/screenboards.go @@ -22,7 +22,7 @@ type Screenboard struct { Shared *bool `json:"shared,omitempty"` Templated *bool `json:"templated,omitempty"` TemplateVariables []TemplateVariable `json:"template_variables,omitempty"` - Widgets []Widget `json:"widgets,omitempty"` + Widgets []Widget `json:"widgets"` ReadOnly *bool `json:"read_only,omitempty"` } diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/search.go b/vendor/github.com/zorkian/go-datadog-api/search.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/search.go rename to vendor/github.com/zorkian/go-datadog-api/search.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/series.go b/vendor/github.com/zorkian/go-datadog-api/series.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/series.go rename to vendor/github.com/zorkian/go-datadog-api/series.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/snapshot.go b/vendor/github.com/zorkian/go-datadog-api/snapshot.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/snapshot.go rename to vendor/github.com/zorkian/go-datadog-api/snapshot.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/tags.go b/vendor/github.com/zorkian/go-datadog-api/tags.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/tags.go rename to vendor/github.com/zorkian/go-datadog-api/tags.go diff --git a/vendor/gopkg.in/zorkian/go-datadog-api.v2/users.go b/vendor/github.com/zorkian/go-datadog-api/users.go similarity index 100% rename from vendor/gopkg.in/zorkian/go-datadog-api.v2/users.go rename to vendor/github.com/zorkian/go-datadog-api/users.go diff --git a/vendor/vendor.json b/vendor/vendor.json index 89d2833df..926159b6a 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -573,6 +573,14 @@ "revision": "b061729afc07e77a8aa4fad0a2fd840958f1942a", "revisionTime": "2016-09-27T10:08:44Z" }, + { + "checksumSHA1": "pS5615UBfIMbuO+xZPtxpMOz50Y=", + "path": "github.com/zorkian/go-datadog-api", + "revision": "114bbae3eb718f241d7d8e55c96d75dfedefb8b3", + "revisionTime": "2018-08-05T21:58:11Z", + "version": "=v2.11.0", + "versionExact": "v2.11.0" + }, { "checksumSHA1": "vE43s37+4CJ2CDU6TlOUOYE0K9c=", "path": "golang.org/x/crypto/bcrypt", @@ -639,12 +647,6 @@ "revision": "1c05540f6879653db88113bc4a2b70aec4bd491f", "revisionTime": "2017-08-04T00:04:37Z" }, - { - "checksumSHA1": "8fwudhaTgqCvOdurqXyIGigPWTE=", - "path": "gopkg.in/zorkian/go-datadog-api.v2", - "revision": "d74ca17e47a9d3708e6203fd48d3f8cdad055e1c", - "revisionTime": "2018-05-23T15:39:50Z" - }, { "checksumSHA1": "wICWAGQfZcHD2y0dHesz9R2YSiw=", "path": "k8s.io/kubernetes/pkg/apimachinery",