diff --git a/helper/amqp.go b/helper/amqp.go index 39bbdc2..7a166d4 100644 --- a/helper/amqp.go +++ b/helper/amqp.go @@ -270,8 +270,10 @@ func CheckConnection() error { // WARNING: this only works with the kubernetes-simple manager of VILLAScontroller func RequestICcreateAMQPsimpleManager(ic *database.InfrastructureComponent, managerUUID string, userName string) (string, error) { newUUID := uuid.New().String() + log.Printf("New IC UUID: %s", newUUID) var lastUpdate ICUpdateToCopy + log.Println(ic.StatusUpdateRaw.RawMessage) err := json.Unmarshal(ic.StatusUpdateRaw.RawMessage, &lastUpdate) if err != nil { return newUUID, err diff --git a/routes/file/file_methods.go b/routes/file/file_methods.go index 5803db8..788d123 100644 --- a/routes/file/file_methods.go +++ b/routes/file/file_methods.go @@ -227,11 +227,15 @@ func (f *File) Delete() error { // delete file from s3 bucket if f.Key != "" { - err = f.deleteS3() - if err != nil { - return err - } - log.Println("Deleted file in S3 object storage") + // TODO we do not delete the file from s3 object storage + // to ensure that no data is lost if multiple File objects reference the same S3 data object + // This behavior should be replaced by a different file handling in the future + //err = f.deleteS3() + //if err != nil { + // return err + //} + //log.Println("Deleted file in S3 object storage") + log.Println("Did NOT delete file in S3 object storage!") } err = db.Model(&so).Association("Files").Delete(f).Error