Compare revisions

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

Source

Target

Show changes

Only incoming changes from source

Include changes to target since source was created

Commits on Source 3

Fix: WORM bucket keys · bf780acc
Petar Hristov authored May 30, 2022

bf780acc
Merge branch 'Issue/2072-wormResourceType' into 'master' · 10c0f635
Petar Hristov authored May 30, 2022
```
Fix: WORM bucket keys

See merge request !165
```
10c0f635

Chore: 2.11.1 · b694309e

CoscineBot authored May 30, 2022

# [2.11.1](v2.11.0...v2.11.1) (2022-05-30)

## Fix
* WORM bucket keys
* WORM bucket keys

b694309e

src/Database.Actions/Database.Actions.csproj

+3
−2

Original line number
Original line
Diff line number
Diff line

@@ -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.*-*" />

src/Database.Tests/Database.Tests.csproj

+2
−1

Original line number
Original line
Diff line number
Diff line

@@ -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>

src/Database/Database.csproj

+1
−1

Original line number
Original line
Diff line number
Diff line

@@ -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>

src/Database/Models/ResourceModel.cs

+25
−0

Original line number
Original line
Diff line number
Diff line

@@ -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

                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

                    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,

src/Scaffolding/Scaffolding.csproj

+2
−1

Original line number
Original line
Diff line number
Diff line

@@ -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 -->

Admin message

Source

Target

Files