Enabled Sentinel-2 download from Google Cloud Storage

Terradue · Apr 19, 2024 · faad63f · faad63f
1 parent 9efbb40
commit faad63f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/src/Stars.Data/Suppliers/DataHubSourceSupplier.cs b/src/Stars.Data/Suppliers/DataHubSourceSupplier.cs
@@ -38,7 +38,7 @@ public DataHubSourceSupplier(ILogger<DataHubSourceSupplier> logger,
             this.credentialsManager = credentialsManager;
             _s3ClientFactory = s3ClientFactory;
             SupplierPluginOption supplierPluginOption = pluginOption as SupplierPluginOption;
-            ConfigureWrapper(new Uri(supplierPluginOption.ServiceUrl));
+            ConfigureWrapper(supplierPluginOption);
         }
 
         public override string Id => wrapper.Name;
@@ -47,11 +47,12 @@ public DataHubSourceSupplier(ILogger<DataHubSourceSupplier> logger,
 
         public IDataHubSourceWrapper Wrapper => wrapper;
 
-        public void ConfigureWrapper(Uri serviceUrl)
+        public void ConfigureWrapper(SupplierPluginOption pluginOption)
         {
+            if (pluginOption == null)
+                throw new ArgumentNullException("pluginOption");
 
-            if (serviceUrl == null)
-                throw new ArgumentNullException("serviceUrl");
+            Uri serviceUrl = new Uri(pluginOption.ServiceUrl);
 
             var target_uri = serviceUrl;
             var target_creds = credentialsManager;
@@ -125,13 +126,22 @@ public void ConfigureWrapper(Uri serviceUrl)
 
             if (target_uri.Host.EndsWith("googleapis.com") || target_uri.Host.EndsWith("google.com"))
             {
-                wrapper = new GoogleWrapper(null, null, target_creds, "https://cloud.google.com");
+                wrapper = new GoogleWrapper(pluginOption.AccountFile, pluginOption.ProjectId, target_creds, "https://cloud.google.com");
             }
 
             this.openSearchable = wrapper.CreateOpenSearchable(new OpenSearchableFactorySettings(this.opensearchEngine));
 
         }
 
+        [Obsolete("Method kept for backward compatibility")]
+        public void ConfigureWrapper(Uri serviceUrl)
+        {
+            if (serviceUrl == null)
+                throw new ArgumentNullException("serviceUrl");
+
+            ConfigureWrapper(new SupplierPluginOption() { ServiceUrl = serviceUrl.AbsoluteUri });
+        }
+
         internal static NetworkCredential GetNetworkCredentials(IConfigurationSection credentials)
         {
             if (credentials == null)

diff --git a/src/Stars.Data/Terradue.Stars.Data.csproj b/src/Stars.Data/Terradue.Stars.Data.csproj
@@ -31,7 +31,7 @@
         <PackageReference Include="Terradue.MetadataExtractor" Version="1.3.0" />
         <PackageReference Include="ProjNet" Version="2.0.0" />
         <PackageReference Include="MimeTypes" Version="2.0.2" />
-        <PackageReference Include="Terradue.OpenSearch.SciHub" Version="1.40.*"/>
+        <PackageReference Include="Terradue.OpenSearch.SciHub" Version="1.41.*"/>
         <PackageReference Include="Terradue.OpenSearch.Asf" Version="1.4.*" />
         <PackageReference Include="Terradue.OpenSearch.Usgs" Version="1.7.*" />
         <PackageReference Include="Terradue.OpenSearch.GeoJson" Version="1.4.5" />

diff --git a/src/Stars.Services/Plugins/PluginsOptions.cs b/src/Stars.Services/Plugins/PluginsOptions.cs
@@ -52,5 +52,9 @@ public PluginOption()
     public class SupplierPluginOption : PluginOption
     {
         public string ServiceUrl { get; set; }
+
+        public string AccountFile { get; set; }
+
+        public string ProjectId { get; set; }
     }
 }