Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[AUTOMATED] Upgrade to Go 1.11 #141

Merged
merged 1 commit into from
Jan 8, 2019
Merged

[AUTOMATED] Upgrade to Go 1.11 #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
- docker
language: go
go:
- 1.11.1
- "1.11.x"

install:
# This script is used by the Travis build to install a cookie for
Expand Down
4 changes: 2 additions & 2 deletions datadog/import_datadog_downtime_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ func TestDatadogDowntime_import(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogDowntimeDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogDowntimeConfigImported,
},
resource.TestStep{
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
Expand Down
8 changes: 4 additions & 4 deletions datadog/import_datadog_monitor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ func TestDatadogMonitor_import(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogMonitorDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogMonitorConfigImported,
},
resource.TestStep{
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
Expand All @@ -34,10 +34,10 @@ func TestDatadogMonitor_import_no_recovery(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogMonitorDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogMonitorConfigImportedNoRecovery,
},
resource.TestStep{
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
Expand Down
4 changes: 2 additions & 2 deletions datadog/import_datadog_user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ func TestDatadogUser_import(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogUserDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogUserConfigImported,
},
resource.TestStep{
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
Expand Down
6 changes: 3 additions & 3 deletions datadog/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ import (
func Provider() terraform.ResourceProvider {
return &schema.Provider{
Schema: map[string]*schema.Schema{
"api_key": &schema.Schema{
"api_key": {
Type: schema.TypeString,
Required: true,
DefaultFunc: schema.EnvDefaultFunc("DATADOG_API_KEY", nil),
},
"app_key": &schema.Schema{
"app_key": {
Type: schema.TypeString,
Required: true,
DefaultFunc: schema.EnvDefaultFunc("DATADOG_APP_KEY", nil),
},
"api_url": &schema.Schema{
"api_url": {
Type: schema.TypeString,
Optional: true,
DefaultFunc: schema.EnvDefaultFunc("DATADOG_HOST", nil),
Expand Down
26 changes: 13 additions & 13 deletions datadog/resource_datadog_downtime_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func TestAccDatadogDowntime_Basic(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogDowntimeDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogDowntimeConfig,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogDowntimeExists("datadog_downtime.foo"),
Expand Down Expand Up @@ -52,7 +52,7 @@ func TestAccDatadogDowntime_BasicWithMonitor(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogDowntimeDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogDowntimeExists("datadog_downtime.foo"),
Expand All @@ -68,7 +68,7 @@ func TestAccDatadogDowntime_BasicMultiScope(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogDowntimeDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogDowntimeConfigMultiScope,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogDowntimeExists("datadog_downtime.foo"),
Expand Down Expand Up @@ -98,7 +98,7 @@ func TestAccDatadogDowntime_BasicNoRecurrence(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogDowntimeDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogDowntimeConfigNoRecurrence,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogDowntimeExists("datadog_downtime.foo"),
Expand All @@ -122,7 +122,7 @@ func TestAccDatadogDowntime_BasicUntilDateRecurrence(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogDowntimeDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogDowntimeConfigUntilDateRecurrence,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogDowntimeExists("datadog_downtime.foo"),
Expand Down Expand Up @@ -152,7 +152,7 @@ func TestAccDatadogDowntime_BasicUntilOccurrencesRecurrence(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogDowntimeDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogDowntimeConfigUntilOccurrencesRecurrence,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogDowntimeExists("datadog_downtime.foo"),
Expand Down Expand Up @@ -182,7 +182,7 @@ func TestAccDatadogDowntime_WeekDayRecurring(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogDowntimeDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogDowntimeConfigWeekDaysRecurrence,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogDowntimeExists("datadog_downtime.foo"),
Expand Down Expand Up @@ -214,7 +214,7 @@ func TestAccDatadogDowntime_Updated(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogDowntimeDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogDowntimeConfig,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogDowntimeExists("datadog_downtime.foo"),
Expand All @@ -232,7 +232,7 @@ func TestAccDatadogDowntime_Updated(t *testing.T) {
"datadog_downtime.foo", "message", "Example Datadog downtime message."),
),
},
resource.TestStep{
{
Config: testAccCheckDatadogDowntimeConfigUpdated,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogDowntimeExists("datadog_downtime.foo"),
Expand Down Expand Up @@ -260,7 +260,7 @@ func TestAccDatadogDowntime_TrimWhitespace(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogDowntimeDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogDowntimeConfigWhitespace,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogDowntimeExists("datadog_downtime.foo"),
Expand Down Expand Up @@ -307,7 +307,7 @@ func TestAccDatadogDowntimeDates(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogDowntimeDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogDowntimeConfigDates,
Check: resource.ComposeTestCheckFunc(
testAccCheckDatadogDowntimeExists("datadog_downtime.foo"),
Expand Down Expand Up @@ -335,11 +335,11 @@ func TestAccDatadogDowntimeDatesConflict(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: testAccCheckDatadogDowntimeDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogDowntimeConfigDatesConflict,
ExpectError: regexp.MustCompile("\"start_date\": conflicts with start"),
},
resource.TestStep{
{
Config: testAccCheckDatadogDowntimeConfigDatesConflict,
ExpectError: regexp.MustCompile("\"end_date\": conflicts with end"),
},
Expand Down
4 changes: 2 additions & 2 deletions datadog/resource_datadog_integration_gcp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestAccDatadogIntegrationGCP(t *testing.T) {
Providers: testAccProviders,
CheckDestroy: checkIntegrationGCPDestroy,
Steps: []resource.TestStep{
resource.TestStep{
{
Config: testAccCheckDatadogIntegrationGCPConfig,
Check: resource.ComposeTestCheckFunc(
checkIntegrationGCPExists,
Expand All @@ -59,7 +59,7 @@ func TestAccDatadogIntegrationGCP(t *testing.T) {
"host_filters", "foo:bar,buzz:lightyear"),
),
},
resource.TestStep{
{
Config: testAccCheckDatadogIntegrationGCPEmptyHostFiltersConfig,
Check: resource.ComposeTestCheckFunc(
checkIntegrationGCPExists,
Expand Down
Loading