Merge pull request #249 from suzuki-shunsuke/test/fix-testdata

fix testdata and example and install_local_terraform
suzuki-shunsuke · Mar 12, 2020 · 80bdb3f · 80bdb3f
2 parents 51f9f6a + 096f5c0
commit 80bdb3f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/examples/v0.12/event_definition.tf b/examples/v0.12/event_definition.tf
@@ -7,7 +7,6 @@ resource "graylog_event_definition" "test" {
 {
   "type": "aggregation-v1",
   "query": "test",
-  "query_parameters": [],
   "streams": [
     "${graylog_stream.test.id}"
   ],
@@ -33,6 +32,8 @@ EOF
 }
 EOF
 
+  key_spec = ["test"]
+
   notification_settings {
     grace_period_ms = 0
     backlog_size    = 0
@@ -54,7 +55,6 @@ resource "graylog_event_definition" "test2" {
 {
   "type": "aggregation-v1",
   "query": "test",
-  "query_parameters": [],
   "streams": [
     "${graylog_stream.test.id}"
   ],

diff --git a/graylog/testdata/event_definition/create/request.go b/graylog/testdata/event_definition/create/request.go
@@ -2,6 +2,7 @@ package create
 
 import (
 	"github.com/suzuki-shunsuke/go-graylog/v11/graylog/graylog"
+	"github.com/suzuki-shunsuke/go-set/v6"
 )
 
 func Request() *graylog.EventDefinition {
@@ -23,6 +24,7 @@ func Request() *graylog.EventDefinition {
 				},
 			},
 		},
+		KeySpec: set.NewStrSet("test"),
 		NotificationSettings: graylog.EventDefinitionNotificationSettings{
 			GracePeriodMS: 0,
 			BacklogSize:   0,

diff --git a/graylog/testdata/event_definition/create/request.json b/graylog/testdata/event_definition/create/request.json
@@ -29,7 +29,7 @@
       ]
     }
   },
-  "key_spec": [],
+  "key_spec": ["test"],
   "notification_settings": {
     "grace_period_ms": 0,
     "backlog_size": 0

diff --git a/graylog/testdata/event_definition/create/response.go b/graylog/testdata/event_definition/create/response.go
@@ -2,6 +2,7 @@ package create
 
 import (
 	"github.com/suzuki-shunsuke/go-graylog/v11/graylog/graylog"
+	"github.com/suzuki-shunsuke/go-set/v6"
 )
 
 func Response() *graylog.EventDefinition {
@@ -23,6 +24,7 @@ func Response() *graylog.EventDefinition {
 				},
 			},
 		},
+		KeySpec: set.NewStrSet("test"),
 		NotificationSettings: graylog.EventDefinitionNotificationSettings{
 			GracePeriodMS: 0,
 			BacklogSize:   0,

diff --git a/graylog/testdata/event_definition/create/response.json b/graylog/testdata/event_definition/create/response.json
@@ -30,7 +30,7 @@
       ]
     }
   },
-  "key_spec": [],
+  "key_spec": ["test"],
   "notification_settings": {
     "grace_period_ms": 0,
     "backlog_size": 0

diff --git a/scripts/install_local_terraform.sh b/scripts/install_local_terraform.sh
@@ -11,4 +11,4 @@ ee() {
 cd "$(dirname "$0")/.."
 
 ee mkdir -p ~/.terraform.d/plugins
-ee go build -o ~/.terraform.d/plugins/terraform-provider-graylog ./terraform
+ee go build -o ~/.terraform.d/plugins/terraform-provider-graylog ./cmd/terraform-provider-graylog