Skip to content

Commit 885703c

Browse files
ysetoyseto
authored
Merge pull request #346 from mkusaka/migrate-provider-protocol-v6
Migrate provider from protocol v5 to v6
2 parents 062baff + da0a247 commit 885703c

26 files changed

+61
-61
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ A [Terraform](https://www.terraform.io/) provider for [mackerel.io](https://mack
1111

1212
## Requirements
1313

14-
Terraform >= v0.14
14+
Terraform >= v1.0
1515

1616
## Usage example
1717

18-
Terraform 0.14 and later
18+
Terraform 1.0 and later
1919

2020
```
2121
terraform {

‎internal/provider/data_source_mackerel_alert_group_setting_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestAccDataSourceMackerelAlertGroupSetting(t *testing.T) {
3535

3636
resource.ParallelTest(t, resource.TestCase{
3737
PreCheck: func() { preCheck(t) },
38-
ProtoV5ProviderFactories: protoV5ProviderFactories,
38+
ProtoV6ProviderFactories: protoV6ProviderFactories,
3939
Steps: []resource.TestStep{
4040
{
4141
Config: testAccDataSourceMackerelAlertGroupSettingConfig(rand, name),

‎internal/provider/data_source_mackerel_aws_integration_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func TestAccDataSourceMackerelAWSIntegrationIAMRole(t *testing.T) {
4444

4545
resource.ParallelTest(t, resource.TestCase{
4646
PreCheck: func() { preCheck(t) },
47-
ProtoV5ProviderFactories: protoV5ProviderFactories,
47+
ProtoV6ProviderFactories: protoV6ProviderFactories,
4848
Steps: []resource.TestStep{
4949
{
5050
Config: testAccDataSourceMackerelAWSIntegrationConfigIAMRole(rand, name, awsRoleArn, externalID),
@@ -83,7 +83,7 @@ func TestAccDataSourceMackerelAWSIntegrationCredential(t *testing.T) {
8383

8484
resource.ParallelTest(t, resource.TestCase{
8585
PreCheck: func() { preCheck(t) },
86-
ProtoV5ProviderFactories: protoV5ProviderFactories,
86+
ProtoV6ProviderFactories: protoV6ProviderFactories,
8787
Steps: []resource.TestStep{
8888
{
8989
Config: testAccDataSourceMackerelAWSIntegrationConfigCredential(rand, name, awsAccessKeyID, awsSecretAccessKey),

‎internal/provider/data_source_mackerel_channel_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestAccDataSourceMackerelChannelEmail(t *testing.T) {
3535

3636
resource.ParallelTest(t, resource.TestCase{
3737
PreCheck: func() { preCheck(t) },
38-
ProtoV5ProviderFactories: protoV5ProviderFactories,
38+
ProtoV6ProviderFactories: protoV6ProviderFactories,
3939
Steps: []resource.TestStep{
4040
{
4141
Config: testAccDataSourceMackerelChannelConfigEmail(name),
@@ -62,7 +62,7 @@ func TestAccDataSourceMackerelChannelSlack(t *testing.T) {
6262

6363
resource.ParallelTest(t, resource.TestCase{
6464
PreCheck: func() { preCheck(t) },
65-
ProtoV5ProviderFactories: protoV5ProviderFactories,
65+
ProtoV6ProviderFactories: protoV6ProviderFactories,
6666
Steps: []resource.TestStep{
6767
{
6868
Config: testAccDataSourceMackerelChannelConfigSlack(name),
@@ -92,7 +92,7 @@ func TestAccDataSourceMackerelChannelWebhook(t *testing.T) {
9292

9393
resource.ParallelTest(t, resource.TestCase{
9494
PreCheck: func() { preCheck(t) },
95-
ProtoV5ProviderFactories: protoV5ProviderFactories,
95+
ProtoV6ProviderFactories: protoV6ProviderFactories,
9696
Steps: []resource.TestStep{
9797
{
9898
Config: testAccDataSourceMackerelChannelConfigWebhook(name),
@@ -181,7 +181,7 @@ data "mackerel_channel" "foo" {
181181
func TestAccDataSourceMackerelChannelNotMatchAnyChannel(t *testing.T) {
182182
resource.ParallelTest(t, resource.TestCase{
183183
PreCheck: func() { preCheck(t) },
184-
ProtoV5ProviderFactories: protoV5ProviderFactories,
184+
ProtoV6ProviderFactories: protoV6ProviderFactories,
185185
Steps: []resource.TestStep{
186186
{
187187
Config: `data "mackerel_channel" "foo" { id = "not-found" }`,

‎internal/provider/data_source_mackerel_dashboard_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestAccDataSourceMackerelDashboardGraph(t *testing.T) {
3434

3535
resource.ParallelTest(t, resource.TestCase{
3636
PreCheck: func() { preCheck(t) },
37-
ProtoV5ProviderFactories: protoV5ProviderFactories,
37+
ProtoV6ProviderFactories: protoV6ProviderFactories,
3838
Steps: []resource.TestStep{
3939
{
4040
Config: testAccDataSourceMackerelDashboardConfigGraph(rand, title),
@@ -85,7 +85,7 @@ func TestAccDataSourceMackerelDashboardValue(t *testing.T) {
8585

8686
resource.ParallelTest(t, resource.TestCase{
8787
PreCheck: func() { preCheck(t) },
88-
ProtoV5ProviderFactories: protoV5ProviderFactories,
88+
ProtoV6ProviderFactories: protoV6ProviderFactories,
8989
Steps: []resource.TestStep{
9090
{
9191
Config: testAccDataSourceMackerelDashboardConfigValue(rand, title),
@@ -139,7 +139,7 @@ func TestAccDataSourceMackerelDashboardMarkdown(t *testing.T) {
139139

140140
resource.ParallelTest(t, resource.TestCase{
141141
PreCheck: func() { preCheck(t) },
142-
ProtoV5ProviderFactories: protoV5ProviderFactories,
142+
ProtoV6ProviderFactories: protoV6ProviderFactories,
143143
Steps: []resource.TestStep{
144144
{
145145
Config: testAccDataSourceMackerelDashboardConfigMarkdown(rand, title),
@@ -176,7 +176,7 @@ func TestAccDataSourceMackerelDashboardAlertStatus(t *testing.T) {
176176

177177
resource.ParallelTest(t, resource.TestCase{
178178
PreCheck: func() { preCheck(t) },
179-
ProtoV5ProviderFactories: protoV5ProviderFactories,
179+
ProtoV6ProviderFactories: protoV6ProviderFactories,
180180
Steps: []resource.TestStep{
181181
{
182182
Config: testAccDataSourceMackerelDashboardConfigAlertStatus(rand, title),

‎internal/provider/data_source_mackerel_downtime_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestAccDataSourceMackerelDowntime(t *testing.T) {
3535

3636
resource.ParallelTest(t, resource.TestCase{
3737
PreCheck: func() { preCheck(t) },
38-
ProtoV5ProviderFactories: protoV5ProviderFactories,
38+
ProtoV6ProviderFactories: protoV6ProviderFactories,
3939
Steps: []resource.TestStep{
4040
{
4141
Config: testAccDataSourceMackerelDowntimeConfig(rand, name),
@@ -120,7 +120,7 @@ data "mackerel_downtime" "foo" {
120120
func TestAccDataSourceMackerelDowntimeNotMatchAnyDowntime(t *testing.T) {
121121
resource.ParallelTest(t, resource.TestCase{
122122
PreCheck: func() { preCheck(t) },
123-
ProtoV5ProviderFactories: protoV5ProviderFactories,
123+
ProtoV6ProviderFactories: protoV6ProviderFactories,
124124
Steps: []resource.TestStep{
125125
{
126126
Config: `data "mackerel_downtime" "foo" { id = "not-found" }`,

‎internal/provider/data_source_mackerel_monitor_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestAccDataSourceMackerelMonitorHostMetric(t *testing.T) {
3434

3535
resource.ParallelTest(t, resource.TestCase{
3636
PreCheck: func() { preCheck(t) },
37-
ProtoV5ProviderFactories: protoV5ProviderFactories,
37+
ProtoV6ProviderFactories: protoV6ProviderFactories,
3838
Steps: []resource.TestStep{
3939
{
4040
Config: testAccDataSourceMackerelMonitorConfigHostMetric(rand, name),
@@ -74,7 +74,7 @@ func TestAccDataSourceMackerelMonitorConnectivity(t *testing.T) {
7474

7575
resource.ParallelTest(t, resource.TestCase{
7676
PreCheck: func() { preCheck(t) },
77-
ProtoV5ProviderFactories: protoV5ProviderFactories,
77+
ProtoV6ProviderFactories: protoV6ProviderFactories,
7878
Steps: []resource.TestStep{
7979
{
8080
Config: testAccDataSourceMackerelMonitorConfigConnectivity(rand, name),
@@ -110,7 +110,7 @@ func TestAccDataSourceMackerelMonitorServiceMetric(t *testing.T) {
110110

111111
resource.ParallelTest(t, resource.TestCase{
112112
PreCheck: func() { preCheck(t) },
113-
ProtoV5ProviderFactories: protoV5ProviderFactories,
113+
ProtoV6ProviderFactories: protoV6ProviderFactories,
114114
Steps: []resource.TestStep{
115115
{
116116
Config: testAccDataSourceMackerelMonitorConfigServiceMetric(serviceName, name),
@@ -152,7 +152,7 @@ func TestAccDataSourceMackerelMonitorExternal(t *testing.T) {
152152

153153
resource.ParallelTest(t, resource.TestCase{
154154
PreCheck: func() { preCheck(t) },
155-
ProtoV5ProviderFactories: protoV5ProviderFactories,
155+
ProtoV6ProviderFactories: protoV6ProviderFactories,
156156
Steps: []resource.TestStep{
157157
{
158158
Config: testAccDataSourceMackerelMonitorConfigExternal(serviceName, name),
@@ -200,7 +200,7 @@ func TestAccDataSourceMackerelMonitorExpression(t *testing.T) {
200200

201201
resource.ParallelTest(t, resource.TestCase{
202202
PreCheck: func() { preCheck(t) },
203-
ProtoV5ProviderFactories: protoV5ProviderFactories,
203+
ProtoV6ProviderFactories: protoV6ProviderFactories,
204204
Steps: []resource.TestStep{
205205
{
206206
Config: testAccDataSourceMackerelMonitorExpression(name),
@@ -237,7 +237,7 @@ func TestAccDataSourceMackerelMonitorAnomalyDetection(t *testing.T) {
237237

238238
resource.ParallelTest(t, resource.TestCase{
239239
PreCheck: func() { preCheck(t) },
240-
ProtoV5ProviderFactories: protoV5ProviderFactories,
240+
ProtoV6ProviderFactories: protoV6ProviderFactories,
241241
Steps: []resource.TestStep{
242242
{
243243
Config: testAccDataSourceMackerelMonitorConfigAnomalyDetection(rand, name),
@@ -274,7 +274,7 @@ func TestAccDataSourceMackerelMonitorQuery(t *testing.T) {
274274

275275
resource.ParallelTest(t, resource.TestCase{
276276
PreCheck: func() { preCheck(t) },
277-
ProtoV5ProviderFactories: protoV5ProviderFactories,
277+
ProtoV6ProviderFactories: protoV6ProviderFactories,
278278
Steps: []resource.TestStep{
279279
{
280280
Config: testAccDataSourceMackerelMonitorConfigQuery(name),

‎internal/provider/data_source_mackerel_notification_group_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestAccDataSourceMackerelNotificationGroup(t *testing.T) {
3535

3636
resource.ParallelTest(t, resource.TestCase{
3737
PreCheck: func() { preCheck(t) },
38-
ProtoV5ProviderFactories: protoV5ProviderFactories,
38+
ProtoV6ProviderFactories: protoV6ProviderFactories,
3939
Steps: []resource.TestStep{
4040
{
4141
Config: testAccDataSourceMackerelNotificationGroupConfig(rand, name),

‎internal/provider/data_source_mackerel_role_metadata_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestAccDataSourceMackerelRoleMetadata(t *testing.T) {
3636

3737
resource.ParallelTest(t, resource.TestCase{
3838
PreCheck: func() { preCheck(t) },
39-
ProtoV5ProviderFactories: protoV5ProviderFactories,
39+
ProtoV6ProviderFactories: protoV6ProviderFactories,
4040
Steps: []resource.TestStep{
4141
{
4242
Config: testAccDataSourceMackerelRoleMetadataConfig(service, role, namespace),

‎internal/provider/data_source_mackerel_role_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestAccDataSourceMackerelRole(t *testing.T) {
3535

3636
resource.ParallelTest(t, resource.TestCase{
3737
PreCheck: func() { preCheck(t) },
38-
ProtoV5ProviderFactories: protoV5ProviderFactories,
38+
ProtoV6ProviderFactories: protoV6ProviderFactories,
3939
Steps: []resource.TestStep{
4040
{
4141
Config: testAccDataSourceMackerelRoleConfig(serviceName, name),

0 commit comments

Comments
 (0)
⚡