Skip to content

Commit

Permalink
Merge pull request #71 from hashicorp/fitzse/audit-logging
Browse files Browse the repository at this point in the history
Support Audit Logging Configuration
  • Loading branch information
Fitzse committed May 10, 2021
2 parents 7820cee + 1b19f53 commit c1d49b3
Show file tree
Hide file tree
Showing 74 changed files with 701 additions and 301 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## 0.3.0 (Unreleased)

IMPROVEMENTS:
* `hcs_cluster` resource: Added `audit_logging_enabled` and `audit_log_storage_container_url` to configure Consul audit logging to an Azure storage container.
* `hcs_cluster` resource: Added `managed_identity_name` to schema for easy setup of the role assignment on the storage container for writing Consul audit logs.

BUG FIXES:
* Pass `cluster_mode` as a property when creating the `hcs_cluster` resource.

Expand Down
9 changes: 7 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ go 1.15
require (
github.com/Azure/azure-sdk-for-go v51.2.0+incompatible
github.com/Azure/go-autorest/autorest v0.11.18
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/go-openapi/analysis v0.20.1 // indirect
github.com/go-openapi/errors v0.20.0
github.com/go-openapi/strfmt v0.20.0
github.com/go-openapi/swag v0.19.14
github.com/go-openapi/runtime v0.19.28 // indirect
github.com/go-openapi/strfmt v0.20.1
github.com/go-openapi/swag v0.19.15
github.com/go-openapi/validate v0.20.2
github.com/google/uuid v1.1.2 // indirect
github.com/hashicorp/go-azure-helpers v0.14.0
Expand All @@ -18,7 +21,9 @@ require (
github.com/hashicorp/go-version v1.2.1
github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.4
github.com/imdario/mergo v0.3.11 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/stretchr/testify v1.7.0
github.com/zclconf/go-cty v1.7.1 // indirect
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect
)
122 changes: 27 additions & 95 deletions go.sum

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions internal/clients/custom_resource_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -291,16 +291,14 @@ func (client CustomResourceProviderClient) ListUpgradeVersions(ctx context.Conte
}

// UpdateCluster invokes the update Custom Resource Provider Action.
func (client CustomResourceProviderClient) UpdateCluster(ctx context.Context, managedResourceGroupID string, newConsulVersion string) (models.HashicorpCloudConsulamaAmaUpdateClusterResponse, error) {
func (client CustomResourceProviderClient) UpdateCluster(ctx context.Context, managedResourceGroupID string, update *models.HashicorpCloudConsulamaAmaClusterUpdate) (models.HashicorpCloudConsulamaAmaUpdateClusterResponse, error) {
var updateResponse models.HashicorpCloudConsulamaAmaUpdateClusterResponse

req, err := client.customActionPreparer(ctx, managedResourceGroupID, "update", models.HashicorpCloudConsulamaAmaUpdateClusterRequest{
ResourceGroup: managedResourceGroupID,
SubscriptionID: client.SubscriptionID,
Update: &models.HashicorpCloudConsulamaAmaClusterUpdate{
ConsulVersion: newConsulVersion,
},
SourceChannel: client.SourceChannel,
Update: update,
SourceChannel: client.SourceChannel,
})
if err != nil {
return updateResponse, err
Expand Down
25 changes: 2 additions & 23 deletions internal/clients/hcs-ama-api-spec/models/google_protobuf_any.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions internal/clients/hcs-ama-api-spec/models/google_rpc_status.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c1d49b3

Please sign in to comment.