update Grafana client to commit 861284d1ba83 (#1405)

yuri-tceretian · web-flow · commit ecd8a3efa5d6 · 2024-03-06T10:16:13.000-05:00
diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/go-openapi/strfmt v0.22.2
 	github.com/grafana/amixr-api-go-client v0.0.11
 	github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20240301205126-15b8e07d4a10
-	github.com/grafana/grafana-openapi-client-go v0.0.0-20240131162504-9263d72bd697
+	github.com/grafana/grafana-openapi-client-go v0.0.0-20240306142804-861284d1ba83
 	github.com/grafana/machine-learning-go-client v0.5.0
 	github.com/grafana/slo-openapi-client/go v0.0.0-20240112175006-de02e75b9d73
 	github.com/grafana/synthetic-monitoring-agent v0.21.0
@@ -47,8 +47,8 @@ require (
 	github.com/go-openapi/jsonreference v0.20.4 // indirect
 	github.com/go-openapi/loads v0.21.5 // indirect
 	github.com/go-openapi/spec v0.20.14 // indirect
-	github.com/go-openapi/swag v0.22.9 // indirect
-	github.com/go-openapi/validate v0.23.0 // indirect
+	github.com/go-openapi/swag v0.22.10 // indirect
+	github.com/go-openapi/validate v0.23.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
diff --git a/go.sum b/go.sum
@@ -72,8 +72,12 @@ github.com/go-openapi/strfmt v0.22.2 h1:DPYOrm6gexCfZZfXUaXFS4+Jw6HAaIIG0SZ5630f
 github.com/go-openapi/strfmt v0.22.2/go.mod h1:HB/b7TCm91rno75Dembc1dFW/0FPLk5CEXsoF9ReNc4=
 github.com/go-openapi/swag v0.22.9 h1:XX2DssF+mQKM2DHsbgZK74y/zj4mo9I99+89xUmuZCE=
 github.com/go-openapi/swag v0.22.9/go.mod h1:3/OXnFfnMAwBD099SwYRk7GD3xOrr1iL7d/XNLXVVwE=
+github.com/go-openapi/swag v0.22.10 h1:4y86NVn7Z2yYd6pfS4Z+Nyh3aAUL3Nul+LMbhFKy0gA=
+github.com/go-openapi/swag v0.22.10/go.mod h1:Cnn8BYtRlx6BNE3DPN86f/xkapGIcLWzh3CLEb4C1jI=
 github.com/go-openapi/validate v0.23.0 h1:2l7PJLzCis4YUGEoW6eoQw3WhyM65WSIcjX6SQnlfDw=
 github.com/go-openapi/validate v0.23.0/go.mod h1:EeiAZ5bmpSIOJV1WLfyYF9qp/B1ZgSaEpHTJHtN5cbE=
+github.com/go-openapi/validate v0.23.1 h1:3YlF+7NP/pKpaZrSxB88oeVbIuCYlWPGKVMWvPcBMYw=
+github.com/go-openapi/validate v0.23.1/go.mod h1:DYvS/pv2Y65SE4hB6Tx+kFC+gS9sPKbqYbY1iwG6z7k=
 github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
 github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -100,6 +104,8 @@ github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20240301205126-15b8
 github.com/grafana/grafana-com-public-clients/go/gcom v0.0.0-20240301205126-15b8e07d4a10/go.mod h1:6sYY1qgwYfSDNQhKQA0tar8Oc38cIGfyqwejhxoOsPs=
 github.com/grafana/grafana-openapi-client-go v0.0.0-20240131162504-9263d72bd697 h1:pqQoKCVWXVtPwgCjFcCtuWiElkSNv1a97uUjiYEUl0k=
 github.com/grafana/grafana-openapi-client-go v0.0.0-20240131162504-9263d72bd697/go.mod h1:EapKj5Z1OKDssvRofVwD8XEuJtZUaysLWPFFM2QoK0Q=
+github.com/grafana/grafana-openapi-client-go v0.0.0-20240306142804-861284d1ba83 h1:n5vecnZOTpRAZu7rIyNmg54k860JPvAuMvnz2AYQD0E=
+github.com/grafana/grafana-openapi-client-go v0.0.0-20240306142804-861284d1ba83/go.mod h1:FiVsMOTtVuo/Ajmt1efuk3/KmDpFQ3qMurQf7e6HwQg=
 github.com/grafana/machine-learning-go-client v0.5.0 h1:Q1K+MPSy8vfMm2jsk3WQ7O77cGr2fM5hxwtPSoPc5NU=
 github.com/grafana/machine-learning-go-client v0.5.0/go.mod h1:QFfZz8NkqVF8++skjkKQXJEZfpCYd8S0yTWJUpsLLTA=
 github.com/grafana/slo-openapi-client/go v0.0.0-20240112175006-de02e75b9d73 h1:E5vAeB5q1H3BVeNhtd1dI8RubucJdPwpx/ElNtKD3ls=
diff --git a/internal/resources/grafana/resource_alerting_mute_timing.go b/internal/resources/grafana/resource_alerting_mute_timing.go
@@ -204,7 +204,7 @@ func suppressMonthDiff(k, oldValue, newValue string, d *schema.ResourceData) boo
 	return oldNormalized == newNormalized
 }
 
-func packIntervals(nts []*models.TimeInterval) []interface{} {
+func packIntervals(nts []*models.TimeIntervalItem) []interface{} {
 	if nts == nil {
 		return nil
 	}
@@ -240,14 +240,14 @@ func packIntervals(nts []*models.TimeInterval) []interface{} {
 	return intervals
 }
 
-func unpackIntervals(raw []interface{}) []*models.TimeInterval {
+func unpackIntervals(raw []interface{}) []*models.TimeIntervalItem {
 	if raw == nil {
 		return nil
 	}
 
-	result := make([]*models.TimeInterval, len(raw))
+	result := make([]*models.TimeIntervalItem, len(raw))
 	for i, r := range raw {
-		interval := models.TimeInterval{}
+		interval := models.TimeIntervalItem{}
 
 		block := map[string]interface{}{}
 		if r != nil {
@@ -256,7 +256,7 @@ func unpackIntervals(raw []interface{}) []*models.TimeInterval {
 
 		if vals, ok := block["times"]; ok && vals != nil {
 			vals := vals.([]interface{})
-			interval.Times = make([]*models.TimeIntervalRange, len(vals))
+			interval.Times = make([]*models.TimeIntervalTimeRange, len(vals))
 			for i := range vals {
 				interval.Times[i] = unpackTimeRange(vals[i])
 			}
@@ -284,16 +284,16 @@ func unpackIntervals(raw []interface{}) []*models.TimeInterval {
 	return result
 }
 
-func packTimeRange(time *models.TimeIntervalRange) interface{} {
+func packTimeRange(time *models.TimeIntervalTimeRange) interface{} {
 	return map[string]string{
 		"start": time.StartTime,
 		"end":   time.EndTime,
 	}
 }
 
-func unpackTimeRange(raw interface{}) *models.TimeIntervalRange {
+func unpackTimeRange(raw interface{}) *models.TimeIntervalTimeRange {
 	vals := raw.(map[string]interface{})
-	return &models.TimeIntervalRange{
+	return &models.TimeIntervalTimeRange{
 		StartTime: vals["start"].(string),
 		EndTime:   vals["end"].(string),
 	}
diff --git a/internal/resources/grafana/resource_alerting_mute_timing_test.go b/internal/resources/grafana/resource_alerting_mute_timing_test.go
@@ -75,7 +75,7 @@ func TestAccMuteTiming_AllTime(t *testing.T) {
 	testutils.CheckOSSTestsEnabled(t, ">9.0.0")
 
 	var mt models.MuteTimeInterval
-	name := "My Mute Timing"
+	name := "My-Mute-Timing"
 
 	resource.ParallelTest(t, resource.TestCase{
 		ProviderFactories: testutils.ProviderFactories,
diff --git a/internal/resources/grafana/resource_organization.go b/internal/resources/grafana/resource_organization.go
@@ -337,7 +337,7 @@ func createUser(meta interface{}, user string) (int64, error) {
 		Name:     user,
 		Login:    user,
 		Email:    user,
-		Password: pass,
+		Password: models.Password(pass),
 	}
 	resp, err := client.AdminUsers.AdminCreateUser(&u)
 	if err != nil {
diff --git a/internal/resources/grafana/resource_user.go b/internal/resources/grafana/resource_user.go
@@ -72,7 +72,7 @@ func CreateUser(ctx context.Context, d *schema.ResourceData, meta interface{}) d
 		Email:    d.Get("email").(string),
 		Name:     d.Get("name").(string),
 		Login:    d.Get("login").(string),
-		Password: d.Get("password").(string),
+		Password: models.Password(d.Get("password").(string)),
 	}
 	resp, err := client.AdminUsers.AdminCreateUser(&user)
 	if err != nil {
@@ -123,7 +123,7 @@ func UpdateUser(ctx context.Context, d *schema.ResourceData, meta interface{}) d
 		return diag.FromErr(err)
 	}
 	if d.HasChange("password") {
-		f := models.AdminUpdateUserPasswordForm{Password: d.Get("password").(string)}
+		f := models.AdminUpdateUserPasswordForm{Password: models.Password(d.Get("password").(string))}
 		if _, err = client.AdminUsers.AdminUpdateUserPassword(id, &f); err != nil {
 			return diag.FromErr(err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ func suppressMonthDiff(k, oldValue, newValue string, d *schema.ResourceData) boo`
`204`	`204`	`return oldNormalized == newNormalized`
`205`	`205`	`}`
`206`	`206`
`207`		`-func packIntervals(nts []*models.TimeInterval) []interface{} {`
	`207`	`+func packIntervals(nts []*models.TimeIntervalItem) []interface{} {`
`208`	`208`	`if nts == nil {`
`209`	`209`	`return nil`
`210`	`210`	`}`
`@@ -240,14 +240,14 @@ func packIntervals(nts []*models.TimeInterval) []interface{} {`
`240`	`240`	`return intervals`
`241`	`241`	`}`
`242`	`242`
`243`		`-func unpackIntervals(raw []interface{}) []*models.TimeInterval {`
	`243`	`+func unpackIntervals(raw []interface{}) []*models.TimeIntervalItem {`
`244`	`244`	`if raw == nil {`
`245`	`245`	`return nil`
`246`	`246`	`}`
`247`	`247`
`248`		`- result := make([]*models.TimeInterval, len(raw))`
	`248`	`+ result := make([]*models.TimeIntervalItem, len(raw))`
`249`	`249`	`for i, r := range raw {`
`250`		`- interval := models.TimeInterval{}`
	`250`	`+ interval := models.TimeIntervalItem{}`
`251`	`251`
`252`	`252`	`block := map[string]interface{}{}`
`253`	`253`	`if r != nil {`
`@@ -256,7 +256,7 @@ func unpackIntervals(raw []interface{}) []*models.TimeInterval {`
`256`	`256`
`257`	`257`	`if vals, ok := block["times"]; ok && vals != nil {`
`258`	`258`	`vals := vals.([]interface{})`
`259`		`- interval.Times = make([]*models.TimeIntervalRange, len(vals))`
	`259`	`+ interval.Times = make([]*models.TimeIntervalTimeRange, len(vals))`
`260`	`260`	`for i := range vals {`
`261`	`261`	`interval.Times[i] = unpackTimeRange(vals[i])`
`262`	`262`	`}`
`@@ -284,16 +284,16 @@ func unpackIntervals(raw []interface{}) []*models.TimeInterval {`
`284`	`284`	`return result`
`285`	`285`	`}`
`286`	`286`
`287`		`-func packTimeRange(time *models.TimeIntervalRange) interface{} {`
	`287`	`+func packTimeRange(time *models.TimeIntervalTimeRange) interface{} {`
`288`	`288`	`return map[string]string{`
`289`	`289`	`"start": time.StartTime,`
`290`	`290`	`"end": time.EndTime,`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`
`294`		`-func unpackTimeRange(raw interface{}) *models.TimeIntervalRange {`
	`294`	`+func unpackTimeRange(raw interface{}) *models.TimeIntervalTimeRange {`
`295`	`295`	`vals := raw.(map[string]interface{})`
`296`		`- return &models.TimeIntervalRange{`
	`296`	`+ return &models.TimeIntervalTimeRange{`
`297`	`297`	`StartTime: vals["start"].(string),`
`298`	`298`	`EndTime: vals["end"].(string),`
`299`	`299`	`}`
Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ func createUser(meta interface{}, user string) (int64, error) {`
`337`	`337`	`Name: user,`
`338`	`338`	`Login: user,`
`339`	`339`	`Email: user,`
`340`		`- Password: pass,`
	`340`	`+ Password: models.Password(pass),`
`341`	`341`	`}`
`342`	`342`	`resp, err := client.AdminUsers.AdminCreateUser(&u)`
`343`	`343`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ func CreateUser(ctx context.Context, d *schema.ResourceData, meta interface{}) d`
`72`	`72`	`Email: d.Get("email").(string),`
`73`	`73`	`Name: d.Get("name").(string),`
`74`	`74`	`Login: d.Get("login").(string),`
`75`		`- Password: d.Get("password").(string),`
	`75`	`+ Password: models.Password(d.Get("password").(string)),`
`76`	`76`	`}`
`77`	`77`	`resp, err := client.AdminUsers.AdminCreateUser(&user)`
`78`	`78`	`if err != nil {`
`@@ -123,7 +123,7 @@ func UpdateUser(ctx context.Context, d *schema.ResourceData, meta interface{}) d`
`123`	`123`	`return diag.FromErr(err)`
`124`	`124`	`}`
`125`	`125`	`if d.HasChange("password") {`
`126`		`- f := models.AdminUpdateUserPasswordForm{Password: d.Get("password").(string)}`
	`126`	`+ f := models.AdminUpdateUserPasswordForm{Password: models.Password(d.Get("password").(string))}`
`127`	`127`	`if _, err = client.AdminUsers.AdminUpdateUserPassword(id, &f); err != nil {`
`128`	`128`	`return diag.FromErr(err)`
`129`	`129`	`}`