From e254d544ecda6edd1dba7de2e55715bcdf0f1263 Mon Sep 17 00:00:00 2001 From: asafmahlev Date: Thu, 11 Apr 2024 10:15:49 +0300 Subject: [PATCH 1/6] Secretless build --- .github/workflows/build.yml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b74cb50..186ea1f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,8 @@ -on: [push] +on: + push: + branches: [ 'master' ] + pull_request: + branches: [ '**' ] name: Rust Build, Test, and Lint @@ -8,16 +12,19 @@ jobs: permissions: checks: write pull-requests: write - environment: sdke2e + id-token: write + contents: read + environment: build env: RUST_BACKTRACE: 1 RUST_LOG: debug - KUSTO_CLUSTER_URL: https://sdkse2etest.eastus.kusto.windows.net - KUSTO_DATABASE: fastbatchinge2e - AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} - AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} - AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} steps: + - name: Azure login + uses: azure/login@v2 + with: + client-id: ${{ secrets.AZURE_CLIENT_ID }} + tenant-id: ${{ secrets.AZURE_TENANT_ID }} + subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - uses: actions/checkout@v1 - uses: actions-rs/toolchain@v1 with: @@ -47,6 +54,8 @@ jobs: CARGO_INCREMENTAL: '0' RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests' RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests' + KUSTO_CLUSTER_URL: https://sdkse2etest.eastus.kusto.windows.net + KUSTO_DATABASE: fastbatchinge2e - uses: actions-rs/grcov@v0.1 id: coverage - name: Publish Unit Test Results From 808be007bc561efb1a2f0f2babcfeb638846f018 Mon Sep 17 00:00:00 2001 From: asafmahlev Date: Thu, 11 Apr 2024 10:33:58 +0300 Subject: [PATCH 2/6] Fixed build error --- azure-kusto-data/Cargo.toml | 2 +- azure-kusto-data/src/cloud_info.rs | 2 +- azure-kusto-data/src/operations/query.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-kusto-data/Cargo.toml b/azure-kusto-data/Cargo.toml index 4366ad6..0f89f4c 100644 --- a/azure-kusto-data/Cargo.toml +++ b/azure-kusto-data/Cargo.toml @@ -44,7 +44,7 @@ once_cell = "1" arrow = { version = "50.0.0", features = ["prettyprint"] } dotenv = "0.15.0" env_logger = "0.10.0" -tokio = { version = "1.25.0", features = ["macros"] } +tokio = { version = "1.25.0", features = ["macros", "rt-multi-thread"] } oauth2 = "4.3.0" criterion = "0.5" clap = { version = "4.1.6", features = ["derive", "env"] } diff --git a/azure-kusto-data/src/cloud_info.rs b/azure-kusto-data/src/cloud_info.rs index 2abfcc9..ad7baeb 100644 --- a/azure-kusto-data/src/cloud_info.rs +++ b/azure-kusto-data/src/cloud_info.rs @@ -62,7 +62,7 @@ impl CloudInfo { ); request.insert_headers(&Accept::from("application/json")); request.insert_headers(&AcceptEncoding::from("gzip, deflate")); - let response = pipeline.send(&mut Context::new(), &mut request).await?; + let response = pipeline.send(&Context::new(), &mut request).await?; let (status_code, _header_map, pinned_stream) = response.deconstruct(); match status_code { StatusCode::Ok => { diff --git a/azure-kusto-data/src/operations/query.rs b/azure-kusto-data/src/operations/query.rs index 0d7ee4a..b846e39 100644 --- a/azure-kusto-data/src/operations/query.rs +++ b/azure-kusto-data/src/operations/query.rs @@ -80,7 +80,7 @@ impl QueryRunner { let response = self .client .pipeline() - .send(&mut context, &mut request) + .send(&context, &mut request) .await?; Ok(response) } From ef78c8f2248b9989ae8ce80791c69c2ebcdec1c7 Mon Sep 17 00:00:00 2001 From: asafmahlev Date: Thu, 11 Apr 2024 10:41:45 +0300 Subject: [PATCH 3/6] Fixed build error --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 186ea1f..ea00867 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,15 +5,15 @@ on: branches: [ '**' ] name: Rust Build, Test, and Lint +permissions: + checks: write + pull-requests: write + id-token: write + contents: read jobs: build-data: runs-on: ubuntu-latest - permissions: - checks: write - pull-requests: write - id-token: write - contents: read environment: build env: RUST_BACKTRACE: 1 From 82bcc39709dd7626a042f398709b193507430acb Mon Sep 17 00:00:00 2001 From: asafmahlev Date: Thu, 11 Apr 2024 10:44:03 +0300 Subject: [PATCH 4/6] Fixed build error --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea00867..3d6a1c7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,6 +35,7 @@ jobs: - uses: mbrobbel/rustfmt-check@master with: token: ${{ secrets.GITHUB_TOKEN }} + mode: review - uses: actions-rs/clippy-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }} From 5bddbcf26c6aeac8f2a65162e7729cc6abf54da6 Mon Sep 17 00:00:00 2001 From: asafmahlev Date: Thu, 11 Apr 2024 10:45:37 +0300 Subject: [PATCH 5/6] fmt --- azure-kusto-data/src/operations/query.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/azure-kusto-data/src/operations/query.rs b/azure-kusto-data/src/operations/query.rs index b846e39..20da6a3 100644 --- a/azure-kusto-data/src/operations/query.rs +++ b/azure-kusto-data/src/operations/query.rs @@ -77,11 +77,7 @@ impl QueryRunner { let bytes = bytes::Bytes::from(serde_json::to_string(&body)?); request.set_body(bytes); - let response = self - .client - .pipeline() - .send(&context, &mut request) - .await?; + let response = self.client.pipeline().send(&context, &mut request).await?; Ok(response) } From b5d5acfa6eb93246bf1d67ef766f36639f79c385 Mon Sep 17 00:00:00 2001 From: asafmahlev Date: Thu, 11 Apr 2024 10:48:14 +0300 Subject: [PATCH 6/6] simpler fmt check --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d6a1c7..d31de3f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,10 +32,7 @@ jobs: override: true components: rustfmt, clippy - uses: Swatinem/rust-cache@v2 - - uses: mbrobbel/rustfmt-check@master - with: - token: ${{ secrets.GITHUB_TOKEN }} - mode: review + - run: cargo fmt --all -- --check - uses: actions-rs/clippy-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }}