Skip to content
Snippets Groups Projects

Fix: WORM bucket keys

Merged Petar Hristov requested to merge Issue/2072-wormResourceType into master
5 files
+ 33
5
Compare changes
  • Side-by-side
  • Inline
Files
5
@@ -130,6 +130,10 @@ namespace Coscine.Database.Models
{
return new RdsS3ResourceTypeModel().GetResourceTypeOptions(resourceTypeOptionId);
}
else if (resourceType.Type == "rdss3worm")
{
return new RdsS3WormResourceTypeModel().GetResourceTypeOptions(resourceTypeOptionId);
}
else
{
return new Dictionary<string, string>();
@@ -244,6 +248,11 @@ namespace Coscine.Database.Models
var rdsS3ResourceTypeModel = new RdsS3ResourceTypeModel();
rdsS3ResourceTypeModel.Delete(rdsS3ResourceTypeModel.GetById(resource.ResourceTypeOptionId.Value));
}
else if (resource.Type.Type == "rdss3worm" && resource.ResourceTypeOptionId != null)
{
var rdsS3WormResourceTypeModel = new RdsS3WormResourceTypeModel();
rdsS3WormResourceTypeModel.Delete(rdsS3WormResourceTypeModel.GetById(resource.ResourceTypeOptionId.Value));
}
}
public ResourceObject CreateReturnObjectFromDatabaseObject(Resource resource)
@@ -310,6 +319,22 @@ namespace Coscine.Database.Models
WriteSecretKey = rdsS3ResourceType.SecretKeyWrite,
};
}
else if (resource.Type.Type == "rdss3worm" && resource.ResourceTypeOptionId != null)
{
var rdsS3WormResourceTypeModel = new RdsS3WormResourceTypeModel();
var rdsS3WormResourceType = rdsS3WormResourceTypeModel.GetById(resource.ResourceTypeOptionId.Value);
resourceTypeOptionObject = new RdsS3ResourceTypeObject
{
Id = rdsS3WormResourceType.Id,
BucketName = rdsS3WormResourceType.BucketName,
Endpoint = rdsS3WormResourceType.Endpoint,
ReadAccessKey = rdsS3WormResourceType.AccessKeyRead,
ReadSecretKey = rdsS3WormResourceType.SecretKeyRead,
Size = rdsS3WormResourceType.Size,
WriteAccessKey = rdsS3WormResourceType.AccessKeyWrite,
WriteSecretKey = rdsS3WormResourceType.SecretKeyWrite,
};
}
return new ResourceObject(
resource.Id,
Loading