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
  • gitkeep
  • dev
  • master
  • Issue/2061-activateResourceTypeRdss3nrw
  • Issue/1910-MigrationtoNET6.0
  • Issue/1940ResouceKeysForNRWAndTUDO
  • Sprint/2022-01
  • Issue/1866-ExtendResourceTypeConfigurationTUDo
  • Issue/1877-ExtendResourceTypeConfigurationNRWFHs
  • Hotfix/64-releaseUDE
  • Product/1629-onboardingOtherUniversities
  • Topic/1711-extendResourceTypeConfiguration
  • Hotfix/1668-versionResourceConfigDepVersion
  • Sprint/2021-13
  • Sprint/2021-11
  • Sprint/2021-10
  • Sprint/2021-05
  • Product/1100-fdsS3
  • Topic/1292-FdsS3
  • Sprint/2021-03
  • Product/1287-dotnet5Sharepoint
  • Topic/1334-dotnet5migration
  • Sprint/2021-01
  • Product/407-net5migration
  • Topic/1226-resourceConfigurationLibraryMigration
  • Sprint/2020-22
  • Product/1154-resourceTypeDefinition
  • Topic/1159-rtdApi
  • v1.1.0
  • v1.2.0
  • v1.3.0
  • v1.4.0
  • v2.0.0
  • v2.1.0
  • v2.1.1
  • v2.1.2
  • v2.1.3
  • v2.1.4
  • v2.2.0
  • v2.3.0
  • v2.4.0
  • v2.5.0
  • v2.6.0
43 results

Target

Select target project
  • Coscine / backend / libraries / ResourceConfiguration
1 result
Select Git revision
  • gitkeep
  • dev
  • master
  • Issue/2061-activateResourceTypeRdss3nrw
  • Issue/1910-MigrationtoNET6.0
  • Issue/1940ResouceKeysForNRWAndTUDO
  • Sprint/2022-01
  • Issue/1866-ExtendResourceTypeConfigurationTUDo
  • Issue/1877-ExtendResourceTypeConfigurationNRWFHs
  • Hotfix/64-releaseUDE
  • Product/1629-onboardingOtherUniversities
  • Topic/1711-extendResourceTypeConfiguration
  • Hotfix/1668-versionResourceConfigDepVersion
  • Sprint/2021-13
  • Sprint/2021-11
  • Sprint/2021-10
  • Sprint/2021-05
  • Product/1100-fdsS3
  • Topic/1292-FdsS3
  • Sprint/2021-03
  • Product/1287-dotnet5Sharepoint
  • Topic/1334-dotnet5migration
  • Sprint/2021-01
  • Product/407-net5migration
  • Topic/1226-resourceConfigurationLibraryMigration
  • Sprint/2020-22
  • Product/1154-resourceTypeDefinition
  • Topic/1159-rtdApi
  • v1.1.0
  • v1.2.0
  • v1.3.0
  • v1.4.0
  • v2.0.0
  • v2.1.0
  • v2.1.1
  • v2.1.2
  • v2.1.3
  • v2.1.4
  • v2.2.0
  • v2.3.0
  • v2.4.0
  • v2.5.0
  • v2.6.0
43 results
Show changes

Commits on Source 4

4 files
+ 19
− 7
Compare changes
  • Side-by-side
  • Inline

Files

README.md

+1 −1

File changed.

Contains only whitespace changes.

src/ResourceConfiguration.Tests/ResourceConfigurationTest.cs

+4 −4
Original line number Original line Diff line number Diff line
@@ -29,13 +29,13 @@ namespace Coscine.ResourceConfiguration.Tests 
        [Test]

        [Test]

        public void TestConstructor()

        public void TestConstructor()

        {

        {

            Coscine.ResourceConfiguration.ResourceConfiguration resourceConfiguration = new Coscine.ResourceConfiguration.ResourceConfiguration();

            _ = new ResourceConfiguration();

        }

        }





        [Test]

        [Test]

        public void TestIsValidResource()

        public void TestIsValidResource()

        {

        {

            Coscine.ResourceConfiguration.ResourceConfiguration resourcenConfiguration = new Coscine.ResourceConfiguration.ResourceConfiguration();

            ResourceConfiguration resourcenConfiguration = new ResourceConfiguration();

            Assert.True(resourcenConfiguration.IsValidResource(_resourceTypeValid));

            Assert.True(resourcenConfiguration.IsValidResource(_resourceTypeValid));

            Assert.False(resourcenConfiguration.IsValidResource(_resourceTypeInvalid));

            Assert.False(resourcenConfiguration.IsValidResource(_resourceTypeInvalid));

        }

        }
@@ -43,7 +43,7 @@ namespace Coscine.ResourceConfiguration.Tests 
        [Test]

        [Test]

        public void TestGetResourceType()

        public void TestGetResourceType()

        {

        {

            Coscine.ResourceConfiguration.ResourceConfiguration resourcenConfiguration = new Coscine.ResourceConfiguration.ResourceConfiguration();

            ResourceConfiguration resourcenConfiguration = new ResourceConfiguration();

            Assert.True(resourcenConfiguration.GetResourceType(_resourceTypeValid).GetType() == new ResourceTypeConfigurationObject().GetType());

            Assert.True(resourcenConfiguration.GetResourceType(_resourceTypeValid).GetType() == new ResourceTypeConfigurationObject().GetType());

            Assert.True(resourcenConfiguration.GetResourceType(_resourceTypeInvalid) == null);

            Assert.True(resourcenConfiguration.GetResourceType(_resourceTypeInvalid) == null);

        }

        }
@@ -51,7 +51,7 @@ namespace Coscine.ResourceConfiguration.Tests 
        [Test]

        [Test]

        public void TestGetResourceTypes()

        public void TestGetResourceTypes()

        {

        {

            Coscine.ResourceConfiguration.ResourceConfiguration resourcenConfiguration = new Coscine.ResourceConfiguration.ResourceConfiguration();

            ResourceConfiguration resourcenConfiguration = new ResourceConfiguration();

            Assert.IsTrue(resourcenConfiguration.GetResourceTypesByStatus("active").Count == resourcenConfiguration.GetAvailableResourceTypes().Count);

            Assert.IsTrue(resourcenConfiguration.GetResourceTypesByStatus("active").Count == resourcenConfiguration.GetAvailableResourceTypes().Count);

        }

        }

src/ResourceConfiguration/ResourceConfiguration.csproj

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 
		<RootNamespace>Coscine.ResourceConfiguration</RootNamespace>

		<RootNamespace>Coscine.ResourceConfiguration</RootNamespace>

		<AssemblyName>Coscine.ResourceConfiguration</AssemblyName>

		<AssemblyName>Coscine.ResourceConfiguration</AssemblyName>

		<TargetFramework>net5.0</TargetFramework>

		<TargetFramework>net5.0</TargetFramework>

		<Version>2.0.0</Version>

		<Version>2.1.0</Version>

	</PropertyGroup>

	</PropertyGroup>

	<PropertyGroup>

	<PropertyGroup>

		<Authors>RWTH Aachen University</Authors>

		<Authors>RWTH Aachen University</Authors>

src/ResourceConfiguration/ResourceTypes.json

+13 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ 
    "status": "active",

    "status": "active",

    "config": {},

    "config": {},

    "requiredFields": [

    "requiredFields": [

      "BucketName",

      "Size"

      "Size"

    ]

    ]

  },

  },
@@ -40,6 +39,19 @@ 
      "ResourceUrl"

      "ResourceUrl"

    ]

    ]

  },

  },

  "rdss3": {

    "name": {

      "de": "FDS S3",

      "en": "RDS S3"

    },

    "path": "ResourceTypeWaterbutlerRdsS3\\Coscine.ResourceTypeWaterbutlerRdsS3.dll",

    "className": "ResourceTypeWaterbutlerRdsS3",

    "status": "active",

    "config": {},

    "requiredFields": [

      "Size"

    ]

  },

  "gitlab": {

  "gitlab": {

    "name": {

    "name": {

      "de": "Gitlab",

      "de": "Gitlab",