Merge pull request #77 from philips-software/feature/79

Implement force_delete

Author: loafoe

.github/workflows/goreleaser.yml

@@ -16,7 +16,10 @@ jobs:
         uses: actions/setup-go@v2
         with:
           stable: false
-          go-version: '1.16.0'
+          go-version: '1.16.3'
+      -
+        name: Go test
+        run: go test ./...
       -
         name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2

CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
+## v0.15.0
+- Refactor and announce `hsdp_function` beta status
+- Filter out sensitive fields from debug logs
+- Add support for `ferrite` backend for `hsdp_function`
+- DICOM Object stores are soft deleted by default, with option to `force_delete`
+
 ## v0.14.8
 - Extra validation for `hsdp_iam_service`
 - Format generated IAM Service PEM key to be more parser friendly (#72)

docs/resources/dicom_object_store.md

@@ -56,6 +56,9 @@ resource "hsdp_dicom_object_store" "store2" {
       * `name` - (Optional) Name of the service
       * `access_token_endpoint` - (Optional) The IAM access token endpoint
       * `token_endpoint` - (Optional) The IAM token endpoint
+* `force_delete` - (Optional) By default object stores are not deleted by the provider (soft-delete). 
+   By setting this value to `true` the provider removes object stores. We strongly sugges to enable this only for ephemeral deployments.
+  
 
 # Attribute reference
 * `access_type` - The access type for this object store

hsdp/resource_dicom_object_store.go

@@ -17,6 +17,7 @@ func resourceDICOMObjectStore() *schema.Resource {
 		CreateContext: resourceDICOMObjectStoreCreate,
 		ReadContext:   resourceDICOMObjectStoreRead,
 		DeleteContext: resourceDICOMObjectStoreDelete,
+		SchemaVersion: 1,
 
 		Schema: map[string]*schema.Schema{
 			"config_url": {
@@ -34,6 +35,12 @@ func resourceDICOMObjectStore() *schema.Resource {
 				Optional: true,
 				ForceNew: true,
 			},
+			"force_delete": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+				ForceNew: true,
+			},
 			"static_access": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -133,11 +140,16 @@ func resourceDICOMObjectStoreDelete(_ context.Context, d *schema.ResourceData, m
 	config := m.(*Config)
 	configURL := d.Get("config_url").(string)
 	orgID := d.Get("organization_id").(string)
+	forceDelete := d.Get("force_delete").(bool)
 	client, err := config.getDICOMConfigClient(configURL)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 	defer client.Close()
+	if !forceDelete { // soft delete
+		d.SetId("")
+		return diags
+	}
 	operation := func() error {
 		var resp *dicom.Response
 		_, resp, err = client.Config.DeleteObjectStore(dicom.ObjectStore{ID: d.Id()}, &dicom.QueryOptions{