Allow unsecure s3 endpoints

kamu-data · Nov 17, 2023 · 1d848ef · 1d848ef
1 parent 848327a
commit 1d848ef
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 16 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,6 +8,10 @@ updates:
     directory: /
     schedule:
       interval: daily
+    groups:
+      all:
+        patterns:
+          - "*"
     ignore:
       # For now we use dependabot to notify us only about major library updates
       - dependency-name: "*"

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -16,7 +16,7 @@ jobs:
     name: Lint / Formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
         with:
           components: rustfmt
@@ -25,12 +25,15 @@ jobs:
         with:
           command: fmt
           args: --check
+      - name: license headers
+        run: |
+          cargo test -p kamu-repo-tools -- license_header
 
   lint_deps:
     name: Lint / Dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
       - run: cargo install --locked cargo-deny
       - run: cargo deny check
@@ -41,7 +44,7 @@ jobs:
     env:
       CARGO_FLAGS: --profile ci --features kamu/ftp
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
       - uses: swatinem/rust-cache@v2
         with:

diff --git a/.github/workflows/release-images.yaml b/.github/workflows/release-images.yaml
@@ -17,10 +17,10 @@ jobs:
       github.event.workflow_run.conclusion == 'success' ||
       github.event.workflow_run.conclusion == null
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -15,7 +15,7 @@ jobs:
         target:
           - x86_64-unknown-linux-gnu
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1  # Uses rust-toolchain file
         with:
           components: rustfmt

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,7 +26,7 @@ kamu-adapter-flight-sql = { git = "https://github.com/kamu-data/kamu-cli", tag =
 
 
 [workspace.package]
-version = "0.10.0"
+version = "0.10.1"
 edition = "2021"
 homepage = "https://github.com/kamu-data/kamu-platform"
 repository = "https://github.com/kamu-data/kamu-platform"

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -11,7 +11,7 @@ Business Source License 1.1
 
 Licensor:                  Kamu Data, Inc.
 
-Licensed Work:             Kamu Platform Version 0.6.3
+Licensed Work:             Kamu Platform Version 0.10.1
                            The Licensed Work is © 2023 Kamu Data, Inc.
 
 Additional Use Grant:      You may use the Licensed Work for any purpose,

diff --git a/src/app/api-server/src/app.rs b/src/app/api-server/src/app.rs
@@ -298,7 +298,8 @@ pub async fn init_dependencies(
             );
             b.bind::<dyn kamu::domain::DatasetRepository, kamu::DatasetRepositoryS3>();
 
-            b.add_value(kamu::ObjectStoreBuilderS3::new(s3_context, false))
+            let allow_http = repo_url.scheme() == "s3+http";
+            b.add_value(kamu::ObjectStoreBuilderS3::new(s3_context, allow_http))
                 .bind::<dyn kamu::domain::ObjectStoreBuilder, kamu::ObjectStoreBuilderS3>();
 
             // Default to GitHub auth

diff --git a/src/utils/repo-tools/src/release.rs b/src/utils/repo-tools/src/release.rs
@@ -111,7 +111,8 @@ fn update_license_text<'t>(
         new_version.major != current_version.major || new_version.minor != current_version.minor;
 
     eprintln!("Updating license version: {}", new_version);
-    let re = regex::Regex::new(r"(Licensed Work:[ ]+Kamu CLI Version )(\d+\.\d+\.\d+)").unwrap();
+    let re =
+        regex::Regex::new(r"(Licensed Work:[ ]+Kamu Platform Version )(\d+\.\d+\.\d+)").unwrap();
     let text = re.replace(text, |c: &Captures| format!("{}{}", &c[1], new_version));
 
     if significant_version {
@@ -154,7 +155,7 @@ mod tests {
             r#"
             ...
             Licensor:                  Kamu Data, Inc.
-            Licensed Work:             Kamu CLI Version 0.63.0
+            Licensed Work:             Kamu Platform Version 0.63.0
             ...
             Change Date:               2025-01-01
             Change License:            Apache License, Version 2.0
@@ -175,7 +176,7 @@ mod tests {
                 r#"
                 ...
                 Licensor:                  Kamu Data, Inc.
-                Licensed Work:             Kamu CLI Version 0.63.1
+                Licensed Work:             Kamu Platform Version 0.63.1
                 ...
                 Change Date:               2025-01-01
                 Change License:            Apache License, Version 2.0
@@ -193,7 +194,7 @@ mod tests {
             r#"
             ...
             Licensor:                  Kamu Data, Inc.
-            Licensed Work:             Kamu CLI Version 0.63.0
+            Licensed Work:             Kamu Platform Version 0.63.0
             ...
             Change Date:               2025-01-01
             Change License:            Apache License, Version 2.0
@@ -214,7 +215,7 @@ mod tests {
                 r#"
                 ...
                 Licensor:                  Kamu Data, Inc.
-                Licensed Work:             Kamu CLI Version 0.64.0
+                Licensed Work:             Kamu Platform Version 0.64.0
                 ...
                 Change Date:               2025-09-01
                 Change License:            Apache License, Version 2.0