Merge pull request #131 from kthcloud/dev

fix broken service offerings
kthcloud · Aug 3, 2023 · 2c5aa15 · 2c5aa15
2 parents 0674c79 + 8d1c3f4
commit 2c5aa15
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/service/vm_service/internal_service/cs_service.go b/service/vm_service/internal_service/cs_service.go
@@ -103,6 +103,13 @@ func CreateCS(params *vmModel.CreateParams) (*CsCreated, error) {
 
 		csVM, err = createCsVM(client, vm, public, userSshPublicKey, adminSshPublicKey)
 		if err != nil {
+			// remove the service offering if the vm creation failed
+			// however, do this as best-effort only to avoid cascading errors
+			if serviceOffering.Created() {
+				_ = client.DeleteServiceOffering(serviceOffering.ID)
+				_ = vmModel.UpdateSubsystemByName(vm.Name, "cs", "serviceOffering", csModels.ServiceOfferingPublic{})
+			}
+
 			return nil, makeError(err)
 		}
 	}