Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
  • coscine/backend/libraries/database
1 result
Select Git revision
Loading items
Show changes
Commits on Source (3)
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
<RootNamespace>Coscine.Database.Actions</RootNamespace> <RootNamespace>Coscine.Database.Actions</RootNamespace>
<AssemblyName>Coscine.Database.Actions</AssemblyName> <AssemblyName>Coscine.Database.Actions</AssemblyName>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Version>2.11.0</Version></PropertyGroup> <Version>2.11.1</Version>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Coscine.Database.Helpers" Version="2.*-*" /> <PackageReference Include="Coscine.Database.Helpers" Version="2.*-*" />
<PackageReference Include="Coscine.Migrations" Version="2.*-*" /> <PackageReference Include="Coscine.Migrations" Version="2.*-*" />
......
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
<AssemblyName>Coscine.Database.Tests</AssemblyName> <AssemblyName>Coscine.Database.Tests</AssemblyName>
<TargetFrameworks>net6.0;net461</TargetFrameworks> <TargetFrameworks>net6.0;net461</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Version>2.11.0</Version></PropertyGroup> <Version>2.11.1</Version>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Database\Database.csproj" /> <ProjectReference Include="..\Database\Database.csproj" />
</ItemGroup> </ItemGroup>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<RootNamespace>Coscine.Database</RootNamespace> <RootNamespace>Coscine.Database</RootNamespace>
<AssemblyName>Coscine.Database</AssemblyName> <AssemblyName>Coscine.Database</AssemblyName>
<TargetFrameworks>net6.0;net461</TargetFrameworks> <TargetFrameworks>net6.0;net461</TargetFrameworks>
<Version>2.11.0</Version> <Version>2.11.1</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Authors>RWTH Aachen University</Authors> <Authors>RWTH Aachen University</Authors>
......
...@@ -130,6 +130,10 @@ namespace Coscine.Database.Models ...@@ -130,6 +130,10 @@ namespace Coscine.Database.Models
{ {
return new RdsS3ResourceTypeModel().GetResourceTypeOptions(resourceTypeOptionId); return new RdsS3ResourceTypeModel().GetResourceTypeOptions(resourceTypeOptionId);
} }
else if (resourceType.Type == "rdss3worm")
{
return new RdsS3WormResourceTypeModel().GetResourceTypeOptions(resourceTypeOptionId);
}
else else
{ {
return new Dictionary<string, string>(); return new Dictionary<string, string>();
...@@ -244,6 +248,11 @@ namespace Coscine.Database.Models ...@@ -244,6 +248,11 @@ namespace Coscine.Database.Models
var rdsS3ResourceTypeModel = new RdsS3ResourceTypeModel(); var rdsS3ResourceTypeModel = new RdsS3ResourceTypeModel();
rdsS3ResourceTypeModel.Delete(rdsS3ResourceTypeModel.GetById(resource.ResourceTypeOptionId.Value)); 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) public ResourceObject CreateReturnObjectFromDatabaseObject(Resource resource)
...@@ -310,6 +319,22 @@ namespace Coscine.Database.Models ...@@ -310,6 +319,22 @@ namespace Coscine.Database.Models
WriteSecretKey = rdsS3ResourceType.SecretKeyWrite, 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( return new ResourceObject(
resource.Id, resource.Id,
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<PropertyGroup> <PropertyGroup>
<RootNamespace>Coscine.Database</RootNamespace> <RootNamespace>Coscine.Database</RootNamespace>
<TargetFrameworks>net6.0;net461</TargetFrameworks> <TargetFrameworks>net6.0;net461</TargetFrameworks>
<Version>2.11.0</Version></PropertyGroup> <Version>2.11.1</Version>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Inflector.NetStandard" Version="1.2.2" /> <PackageReference Include="Inflector.NetStandard" Version="1.2.2" />
<!-- Note: use Microsoft.EntityFrameworkCore Version 3.x.x for compatibility with net461 --> <!-- Note: use Microsoft.EntityFrameworkCore Version 3.x.x for compatibility with net461 -->
......