move scripts to top level

.cargo/config.toml

@@ -1,6 +1,4 @@
 [env]
-CLI_VERSION = "4.1.1"
-CLI_VERSION_MAJOR = "4"
 ENCLAVE_RUNTIME_VERSION = "1.0.5"
 [registry]
 global-credential-providers = ["cargo:token"]

.github/workflows/build-and-publish.yml

@@ -58,9 +58,8 @@ jobs:
         run: cargo install cross
 
       - name: Inject Version
-        working-directory: crates/ev-cli
         run: |
-          sh ./scripts/insert-cli-version.sh ${{ inputs.full-version }}
+          sh ./scripts/insert-crate-versions.sh ${{ inputs.full-version }}
 
       - name: Build and Compress cli
         run: |
@@ -84,9 +83,8 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Inject Version
-        working-directory: crates/ev-cli
         run: |
-          sh ./scripts/insert-cli-version.sh ${{ inputs.full-version }}
+          sh ./scripts/insert-crate-versions.sh ${{ inputs.full-version }}
 
       - uses: actions-rs/toolchain@v1
         with:
@@ -154,7 +152,6 @@ jobs:
 
       - uses: actions/checkout@v3
       - name: Update install script in S3
-        working-directory: crates/ev-cli
         run: |
           sh ./scripts/generate-installer.sh ${{ inputs.full-version }} ${{ inputs.major-version }} ${{ inputs.ev-domain }}
           sh ./scripts/update-versions.sh ${{ inputs.full-version }} ${{ inputs.ev-domain }}

crates/common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "common"
-version = "0.1.0"
+version = "1.0.0-dev"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

crates/common/src/api/client.rs

@@ -71,11 +71,11 @@ pub trait ApiClient {
     }
 
     fn user_agent(&self) -> String {
-        format!("evervault-cli/{}", env!("CLI_VERSION"))
+        format!("evervault-cli/{}", env!("CARGO_PKG_VERSION"))
     }
 
     fn accept(&self) -> String {
-        format!("application/json;version={}", env!("CLI_VERSION_MAJOR"))
+        "application/json".to_string()
     }
 
     fn is_authorised(&self) -> bool {

crates/common/src/api/enclave_assets.rs

@@ -43,6 +43,10 @@ impl ApiClient for EnclaveAssetsClient {
     fn update_auth(&mut self, _: AuthMode) -> Result<(), ApiClientError> {
         Err(ApiClientError::AuthModeNotSupported)
     }
+
+    fn accept(&self) -> String {
+        format!("application/json;version={}", 1)
+    }
 }
 
 impl Default for EnclaveAssetsClient {

crates/ev-cli/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "ev-cli"
-version = "0.0.0"
+version = "1.0.0-dev"
 
 [[bin]]
 name = "ev"

scripts/insert-crate-versions.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+pattern="s/1.0.0-dev/$1/"
+sed -i -e "$pattern" ./crates/ev-cli/Cargo.toml
+sed -i -e "$pattern" ./crates/common/Cargo.toml