add delete scf org waiter

Author: fapo85

CHANGELOG.md

@@ -1,8 +1,10 @@
 ## Release (2025-XX-XX)
 - `scf`:
-  - [v0.2.0](services/scf/CHANGELOG.md#v020)
-    - **Feature:** Add field `OrgId` in model `OrgManager`
-    - **Feature:** Add new model `OrganizationCreateBffResponse` and `SpaceCreatedBffResponse`
+    - [v0.2.1](services/scf/CHANGELOG.md#v021)
+        - **Feature:** Add waiter for deletion of organization
+    - [v0.2.0](services/scf/CHANGELOG.md#v020)
+        - **Feature:** Add field `OrgId` in model `OrgManager`
+        - **Feature:** Add new model `OrganizationCreateBffResponse` and `SpaceCreatedBffResponse`
   - [v0.1.0](services/scf/CHANGELOG.md#v010)
     - **New:** STACKIT Cloud Foundry module
 - `core`: [v0.17.3](core/CHANGELOG.md#v0173) 

services/scf/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.2.1
+- **Feature:** Add waiter for deletion of organization
+
 ## v0.2.0
 - **Feature:** Add field `OrgId` in model `OrgManager`
 - **Feature:** Add new model `OrganizationCreateBffResponse` and `SpaceCreatedBffResponse`

services/scf/wait/wait.go

@@ -12,7 +12,7 @@ import (
 	"github.com/stackitcloud/stackit-sdk-go/services/scf"
 )
 
-const STATUS_DELETING_FAILED = "deleting_failed"
+const status_deleting_failed = "deleting_failed"
 
 // Interfaces needed for tests
 type APIClientInterface interface {
@@ -31,7 +31,10 @@ func DeleteOrganizationWaitHandler(ctx context.Context, a APIClientInterface, pr
 			}
 			return false, s, err
 		}
-		if *s.Status == STATUS_DELETING_FAILED {
+		if s == nil {
+			return false, nil, errors.New("organization is nil")
+		}
+		if *s.Status == status_deleting_failed {
 			return true, nil, fmt.Errorf("delete failed for Organization with id %s", orgId)
 		}
 		return false, s, nil

services/scf/wait/wait_test.go

@@ -22,7 +22,7 @@ type apiClientMocked struct {
 	returnInstance bool
 	projectId      string
 	instanceId     string
-	getGitResponse *scf.Organization
+	getSCFResponse *scf.Organization
 }
 
 func (a *apiClientMocked) GetOrganizationExecute(_ context.Context, _, _, _ string) (*scf.Organization, error) {
@@ -34,7 +34,7 @@ func (a *apiClientMocked) GetOrganizationExecute(_ context.Context, _, _, _ stri
 	if !a.returnInstance {
 		return nil, nil
 	}
-	return a.getGitResponse, nil
+	return a.getSCFResponse, nil
 }
 
 func TestDeleteOrganizationWaitHandler(t *testing.T) {
@@ -67,6 +67,12 @@ func TestDeleteOrganizationWaitHandler(t *testing.T) {
 				Status: &statusDeletingFailed,
 			},
 		},
+		{
+			desc:           "Instance is nil",
+			wantErr:        true,
+			returnInstance: true,
+			getOrgResponse: nil,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {
@@ -76,7 +82,7 @@ func TestDeleteOrganizationWaitHandler(t *testing.T) {
 				getFails:       tt.getFails,
 				errorCode:      tt.errorCode,
 				returnInstance: tt.returnInstance,
-				getGitResponse: tt.getOrgResponse,
+				getSCFResponse: tt.getOrgResponse,
 			}
 
 			handler := DeleteOrganizationWaitHandler(context.Background(), apiClient, apiClient.projectId, REGION, apiClient.instanceId)