diff --git a/go.mod b/go.mod index 477e4011c..621e57ca4 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/antihax/optional v1.0.0 github.com/docker/docker v20.10.22+incompatible - github.com/harness/harness-go-sdk v0.3.25 + github.com/harness/harness-go-sdk v0.3.26 github.com/harness/harness-openapi-go-client v0.0.17 github.com/hashicorp/terraform-plugin-sdk/v2 v2.26.1 github.com/pkg/errors v0.9.1 @@ -73,12 +73,12 @@ require ( golang.org/x/mod v0.10.0 // indirect golang.org/x/net v0.9.0 // indirect golang.org/x/oauth2 v0.7.0 // indirect - golang.org/x/sys v0.7.0 // indirect + golang.org/x/sys v0.8.0 // indirect golang.org/x/text v0.9.0 // indirect golang.org/x/tools v0.6.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect - google.golang.org/grpc v1.54.0 // indirect + google.golang.org/grpc v1.55.0 // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.3.0 // indirect diff --git a/go.sum b/go.sum index cb0f235aa..ab050ad4f 100644 --- a/go.sum +++ b/go.sum @@ -43,8 +43,8 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/harness/harness-go-sdk v0.3.25 h1:mvNlTDAHhHQqbSsvB7L4qkJE+NUY7P982jhqWKPZfi8= -github.com/harness/harness-go-sdk v0.3.25/go.mod h1:CPXydorp4zd5Dz2u2FXiHyWL4yd5PQafOMN69cgPSvk= +github.com/harness/harness-go-sdk v0.3.26 h1:7VTI8k8jDxx3SHe7mSA6koyPAtAaLCgAnNaTtYutFus= +github.com/harness/harness-go-sdk v0.3.26/go.mod h1:CPXydorp4zd5Dz2u2FXiHyWL4yd5PQafOMN69cgPSvk= github.com/harness/harness-openapi-go-client v0.0.17 h1:EZneIyi6sV+dlTgXbawxdVD0OoDmG3mnGHEJbwslRzc= github.com/harness/harness-openapi-go-client v0.0.17/go.mod h1:u0vqYb994BJGotmEwJevF4L3BNAdU9i8ui2d22gmLPA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -73,6 +73,7 @@ github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mO github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/hc-install v0.5.1 h1:eCqToNCob7m2R8kM8Gr7XcVmcRSz9ppCFSVZbMh0X+0= github.com/hashicorp/hc-install v0.5.1/go.mod h1:iDPCnzKo+SzToOh25R8OWpLdhhy7yBfJX3PmVWiYhrM= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl/v2 v2.16.2 h1:mpkHZh/Tv+xet3sy3F9Ld4FyI2tUpWe9x3XtPx9f1a0= github.com/hashicorp/hcl/v2 v2.16.2/go.mod h1:JRmR89jycNkrrqnMmvPDMd56n1rQJ2Q6KocSLCMCXng= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= @@ -218,6 +219,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -245,6 +248,8 @@ google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaL google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= diff --git a/internal/service/platform/monitored_service/resource_monitored_service_test.go b/internal/service/platform/monitored_service/resource_monitored_service_test.go index bb597d6be..d5c16de5f 100644 --- a/internal/service/platform/monitored_service/resource_monitored_service_test.go +++ b/internal/service/platform/monitored_service/resource_monitored_service_test.go @@ -134,7 +134,7 @@ func testAccResourceMonitoredService(id string, name string) string { health_sources { name = "name" identifier = "identifier" - type = "ElasticSearch" + type = "DatadogLog" spec = jsonencode({ connectorRef = "connectorRef" feature = "feature" @@ -142,20 +142,8 @@ func testAccResourceMonitoredService(id string, name string) string { { name = "name" query = "query" - index = "index" + indexes = ["index"] serviceInstanceIdentifier = "serviceInstanceIdentifier" - timeStampIdentifier = "timeStampIdentifier" - timeStampFormat = "timeStampFormat" - messageIdentifier = "messageIdentifier" - }, - { - name = "name2" - query = "query2" - index = "index2" - serviceInstanceIdentifier = "serviceInstanceIdentifier2" - timeStampIdentifier = "timeStampIdentifier2" - timeStampFormat = "timeStampFormat2" - messageIdentifier = "messageIdentifier2" } ]}) } @@ -168,14 +156,7 @@ func testAccResourceMonitoredService(id string, name string) string { }) category = "Deployment" } - notification_rule_refs { - notification_rule_ref = "notification_rule_ref" - enabled = true - } - notification_rule_refs { - notification_rule_ref = "notification_rule_ref1" - enabled = false - } + enabled = true } } diff --git a/internal/service/platform/slo/resource_slo_test.go b/internal/service/platform/slo/resource_slo_test.go index a6361722c..9b2b31066 100644 --- a/internal/service/platform/slo/resource_slo_test.go +++ b/internal/service/platform/slo/resource_slo_test.go @@ -26,7 +26,7 @@ func TestAccResourceSlo(t *testing.T) { ExternalProviders: map[string]resource.ExternalProvider{ "time": {}, }, - CheckDestroy: testAccSloDestroy(resourceName), + CheckDestroy: testAccSloDestroy(resourceName), Steps: []resource.TestStep{ { Config: testAccResourceSlo(id, name), @@ -202,14 +202,6 @@ func testAccResourceSlo(id string, name string) string { }) category = "Deployment" } - notification_rule_refs { - notification_rule_ref = "notification_rule_ref" - enabled = true - } - notification_rule_refs { - notification_rule_ref = "notification_rule_ref1" - enabled = false - } template_ref = "template_ref" version_label = "version_label" enabled = true @@ -260,10 +252,7 @@ func testAccResourceSlo(id string, name string) string { } ] }) - notification_rule_refs { - notification_rule_ref = "notification_rule_ref" - enabled = true - } + } }