Merge pull request #308 from cpontes-ns1/PENG-3689

cpontes-ns1 · web-flow · commit 93b60f8ce5d9 · 2024-02-15T16:07:05.000Z
PENG-3689 - Introducing support for datasets functionality
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.0 (February 14, 2024)
+ENHANCEMENTS
+* `Adds support for Datasets
+
 ## 2.0.10 (October 12, 2023)
 BUGFIX
 * `ns1-go` client version bump to fix omitting tags
diff --git a/examples/datasets.tf b/examples/datasets.tf
@@ -0,0 +1,13 @@
+resource "ns1_dataset" "my_dataset" {
+  name     = "my dataset"
+  datatype {
+    type  = "num_queries"
+    scope = "account"
+    data  = {}
+  }
+  timeframe {
+    aggregation = "monthly"
+    cycles      = 1
+  }
+  export_type = "csv"
+}
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/hashicorp/go-retryablehttp v0.7.2
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
 	github.com/stretchr/testify v1.8.1
-	gopkg.in/ns1/ns1-go.v2 v2.7.13
+	gopkg.in/ns1/ns1-go.v2 v2.8.0
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -250,8 +250,8 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/ns1/ns1-go.v2 v2.7.13 h1:r07CLALg18f/L1KIK1ZJdbirBV349UtYT1rDWGjnaTk=
-gopkg.in/ns1/ns1-go.v2 v2.7.13/go.mod h1:pfaU0vECVP7DIOr453z03HXS6dFJpXdNRwOyRzwmPSc=
+gopkg.in/ns1/ns1-go.v2 v2.8.0 h1:oX8QEHCCvnbTSqnSZRRHiGJsgke8eluTtQhNlPpFZBc=
+gopkg.in/ns1/ns1-go.v2 v2.8.0/go.mod h1:pfaU0vECVP7DIOr453z03HXS6dFJpXdNRwOyRzwmPSc=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/ns1/config.go b/ns1/config.go
@@ -19,7 +19,7 @@ import (
 )
 
 var (
-	clientVersion     = "2.0.10"
+	clientVersion     = "2.1.0"
 	providerUserAgent = "tf-ns1" + "/" + clientVersion
 	defaultRetryMax   = 3
 )
diff --git a/ns1/provider.go b/ns1/provider.go
@@ -77,6 +77,7 @@ func Provider() *schema.Provider {
 			"ns1_subnet":            resourceSubnet(),
 			"ns1_dnsview":           dnsView(),
 			"ns1_account_whitelist": accountWhitelistResource(),
+			"ns1_dataset":           datasetResource(),
 		},
 		ConfigureFunc: ns1Configure,
 	}
diff --git a/ns1/resource_dataset.go b/ns1/resource_dataset.go
diff --git a/ns1/resource_dataset_test.go b/ns1/resource_dataset_test.go

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ require (`
`7`	`7`	`github.com/hashicorp/go-retryablehttp v0.7.2`
`8`	`8`	`github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1`
`9`	`9`	`github.com/stretchr/testify v1.8.1`
`10`		`- gopkg.in/ns1/ns1-go.v2 v2.7.13`
	`10`	`+ gopkg.in/ns1/ns1-go.v2 v2.8.0`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`require (`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`var (`
`22`		`- clientVersion = "2.0.10"`
	`22`	`+ clientVersion = "2.1.0"`
`23`	`23`	`providerUserAgent = "tf-ns1" + "/" + clientVersion`
`24`	`24`	`defaultRetryMax = 3`
`25`	`25`	`)`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ func Provider() *schema.Provider {`
`77`	`77`	`"ns1_subnet": resourceSubnet(),`
`78`	`78`	`"ns1_dnsview": dnsView(),`
`79`	`79`	`"ns1_account_whitelist": accountWhitelistResource(),`
	`80`	`+ "ns1_dataset": datasetResource(),`
`80`	`81`	`},`
`81`	`82`	`ConfigureFunc: ns1Configure,`
`82`	`83`	`}`