Skip to content

Commit b9e46d0

Browse files
cpontes-ns1cpontes-ns1
authored
Merge pull request #344 from ns1-terraform/PENG-6244
PENG-6244 - Adds support for billing-usage endpoints
2 parents 74d31b4 + 668d629 commit b9e46d0

13 files changed

Lines changed: 944 additions & 61 deletions

‎.github/workflows/issue_notify.yml‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎.github/workflows/pr_notify.yml‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.6.0 (April 02, 2025)
2+
ENHANCEMENTS
3+
* Adds support for billing-usage endpoints
4+
15
## 2.5.3 (March 7, 2025)
26
ENHANCEMENTS
37
* Added support for OpenPGPKEY, SSHFP, APL, GPOS, IPSECKEY, URI records

‎examples/billing_usage.tf‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# Get query usage data for the given timeframe
2+
resource "ns1_billing_usage" "queries" {
3+
metric_type = "queries"
4+
from = 1731605824 # 2024-11-15 00:00:00 UTC
5+
to = 1734197824 # 2024-12-15 00:00:00 UTC
6+
}
7+
8+
# Get account limits data for the given timeframe
9+
resource "ns1_billing_usage" "limits" {
10+
metric_type = "limits"
11+
from = 1731605824 # 2024-11-15 00:00:00 UTC
12+
to = 1734197824 # 2024-12-15 00:00:00 UTC
13+
}
14+
15+
# Get RUM decisions usage data for the given timeframe
16+
resource "ns1_billing_usage" "decisions" {
17+
metric_type = "decisions"
18+
from = 1731605824 # 2024-11-15 00:00:00 UTC
19+
to = 1734197824 # 2024-12-15 00:00:00 UTC
20+
}
21+
22+
# Get filter chains usage data
23+
resource "ns1_billing_usage" "filter_chains" {
24+
metric_type = "filter-chains"
25+
}
26+
27+
# Get monitoring jobs usage data
28+
resource "ns1_billing_usage" "monitors" {
29+
metric_type = "monitors"
30+
}
31+
32+
# Get records usage data
33+
resource "ns1_billing_usage" "records" {
34+
metric_type = "records"
35+
}
36+
37+
# Example of using the data in other resources
38+
output "total_queries" {
39+
value = ns1_billing_usage.queries.clean_queries
40+
}
41+
42+
output "total_ddos_queries" {
43+
value = ns1_billing_usage.queries.ddos_queries
44+
}
45+
46+
output "total_nxd_responses" {
47+
value = ns1_billing_usage.queries.nxd_responses
48+
}
49+
50+
output "queries_limit" {
51+
value = ns1_billing_usage.limits.queries_limit
52+
}
53+
54+
output "total_decisions" {
55+
value = ns1_billing_usage.decisions.total_usage
56+
}
57+
58+
output "decisions_limit" {
59+
value = ns1_billing_usage.limits.decisions_limit
60+
}
61+
62+
output "total_filter_chains" {
63+
value = ns1_billing_usage.filter_chains.total_usage
64+
}
65+
66+
output "filter_chains_limit" {
67+
value = ns1_billing_usage.limits.filter_chains_limit
68+
}
69+
70+
output "total_monitors" {
71+
value = ns1_billing_usage.monitors.total_usage
72+
}
73+
74+
output "monitors_limit" {
75+
value = ns1_billing_usage.limits.monitors_limit
76+
}
77+
78+
output "total_records" {
79+
value = ns1_billing_usage.records.total_usage
80+
}
81+
82+
output "records_limit" {
83+
value = ns1_billing_usage.limits.records_limit
84+
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/hashicorp/go-retryablehttp v0.7.7
88
github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
99
github.com/stretchr/testify v1.8.1
10-
gopkg.in/ns1/ns1-go.v2 v2.13.0
10+
gopkg.in/ns1/ns1-go.v2 v2.14.0
1111
)
1212

1313
require (

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,8 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
253253
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
254254
gopkg.in/ns1/ns1-go.v2 v2.13.0 h1:I5NNqI9Bi1SGK92TVkOvLTwux5LNrix/99H2datVh48=
255255
gopkg.in/ns1/ns1-go.v2 v2.13.0/go.mod h1:pfaU0vECVP7DIOr453z03HXS6dFJpXdNRwOyRzwmPSc=
256+
gopkg.in/ns1/ns1-go.v2 v2.14.0 h1:qLuHV8qp/bv/vClA8P5V0fv0Mo+k8w/WM29jBjRD6oc=
257+
gopkg.in/ns1/ns1-go.v2 v2.14.0/go.mod h1:pfaU0vECVP7DIOr453z03HXS6dFJpXdNRwOyRzwmPSc=
256258
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
257259
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
258260
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

‎ns1/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
)
2020

2121
var (
22-
clientVersion = "2.5.3"
22+
clientVersion = "2.6.0"
2323
providerUserAgent = "tf-ns1" + "/" + clientVersion
2424
defaultRetryMax = 3
2525
)

‎ns1/examples/billing_usage.tf‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Get query usage data for the given timeframe
2+
resource "ns1_billing_usage" "queries" {
3+
metric_type = "queries"
4+
from = 1731605824 # 2024-11-15 00:00:00 UTC
5+
to = 1734197824 # 2024-12-15 00:00:00 UTC
6+
}
7+
8+
# Get account limits data for the given timeframe
9+
resource "ns1_billing_usage" "limits" {
10+
metric_type = "limits"
11+
from = 1731605824 # 2024-11-15 00:00:00 UTC
12+
to = 1734197824 # 2024-12-15 00:00:00 UTC
13+
}
14+
15+
# Get RUM decisions usage data for the given timeframe
16+
resource "ns1_billing_usage" "decisions" {
17+
metric_type = "decisions"
18+
from = 1731605824 # 2024-11-15 00:00:00 UTC
19+
to = 1734197824 # 2024-12-15 00:00:00 UTC
20+
}
21+
22+
# Get filter chains usage data
23+
resource "ns1_billing_usage" "filter_chains" {
24+
metric_type = "filter-chains"
25+
}
26+
27+
# Get monitoring jobs usage data
28+
resource "ns1_billing_usage" "monitors" {
29+
metric_type = "monitors"
30+
}
31+
32+
# Get records usage data
33+
resource "ns1_billing_usage" "records" {
34+
metric_type = "records"
35+
}

‎ns1/provider.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ func Provider() *schema.Provider {
5555
"ns1_record": dataSourceRecord(),
5656
"ns1_networks": dataSourceNetworks(),
5757
"ns1_monitoring_regions": dataSourceMonitoringRegions(),
58+
"billing_usage": billingUsageResource(),
5859
},
5960
ResourcesMap: map[string]*schema.Resource{
6061
"ns1_zone": resourceZone(),

0 commit comments

Comments
 (0)