From bee6bea121fca2a802f1eb514726e51cdb038c82 Mon Sep 17 00:00:00 2001
From: Mark Doyle <mark@mdoyle.sh>
Date: Wed, 26 Jun 2024 10:06:31 +0100
Subject: [PATCH] move scripts to top level

---
 .cargo/config.toml                                       | 2 --
 .github/workflows/build-and-publish.yml                  | 7 ++-----
 Cargo.lock                                               | 4 ++--
 crates/common/Cargo.toml                                 | 2 +-
 crates/common/src/api/client.rs                          | 4 ++--
 crates/common/src/api/enclave_assets.rs                  | 4 ++++
 crates/ev-cli/Cargo.toml                                 | 2 +-
 crates/ev-cli/scripts/insert-cli-version.sh              | 4 ----
 {crates/ev-cli/scripts => scripts}/generate-installer.sh | 0
 scripts/insert-crate-versions.sh                         | 5 +++++
 {crates/ev-cli/scripts => scripts}/install.template      | 0
 {crates/ev-cli/scripts => scripts}/update-versions.sh    | 0
 {crates/ev-cli/scripts => scripts}/version.template      | 0
 13 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 crates/ev-cli/scripts/insert-cli-version.sh
 rename {crates/ev-cli/scripts => scripts}/generate-installer.sh (100%)
 create mode 100644 scripts/insert-crate-versions.sh
 rename {crates/ev-cli/scripts => scripts}/install.template (100%)
 rename {crates/ev-cli/scripts => scripts}/update-versions.sh (100%)
 rename {crates/ev-cli/scripts => scripts}/version.template (100%)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 58cfcf0f..5b4a5964 100644
--- a/.cargo/config.toml
+++ b/.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"]
diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index 67f8788e..1f2f89c3 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.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 }}
diff --git a/Cargo.lock b/Cargo.lock
index 4cb0a19a..7bd3be57 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -604,7 +604,7 @@ checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "common"
-version = "0.1.0"
+version = "1.0.0-dev"
 dependencies = [
  "async-trait",
  "elliptic-curve 0.13.8",
@@ -1105,7 +1105,7 @@ dependencies = [
 
 [[package]]
 name = "ev-cli"
-version = "0.0.0"
+version = "1.0.0-dev"
 dependencies = [
  "async-trait",
  "attestation-doc-validation",
diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml
index 6ac437c6..1b1dce83 100644
--- a/crates/common/Cargo.toml
+++ b/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
diff --git a/crates/common/src/api/client.rs b/crates/common/src/api/client.rs
index b4f70f1c..d2d50a42 100644
--- a/crates/common/src/api/client.rs
+++ b/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 {
diff --git a/crates/common/src/api/enclave_assets.rs b/crates/common/src/api/enclave_assets.rs
index c398efdf..fa2c93c7 100644
--- a/crates/common/src/api/enclave_assets.rs
+++ b/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 {
diff --git a/crates/ev-cli/Cargo.toml b/crates/ev-cli/Cargo.toml
index 29e30653..720a6d75 100644
--- a/crates/ev-cli/Cargo.toml
+++ b/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"
diff --git a/crates/ev-cli/scripts/insert-cli-version.sh b/crates/ev-cli/scripts/insert-cli-version.sh
deleted file mode 100644
index 13889806..00000000
--- a/crates/ev-cli/scripts/insert-cli-version.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-pattern="s/1.0.0-dev/$1/"
-sed -i -e "$pattern" ./Cargo.toml
diff --git a/crates/ev-cli/scripts/generate-installer.sh b/scripts/generate-installer.sh
similarity index 100%
rename from crates/ev-cli/scripts/generate-installer.sh
rename to scripts/generate-installer.sh
diff --git a/scripts/insert-crate-versions.sh b/scripts/insert-crate-versions.sh
new file mode 100644
index 00000000..ff80cd49
--- /dev/null
+++ b/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
diff --git a/crates/ev-cli/scripts/install.template b/scripts/install.template
similarity index 100%
rename from crates/ev-cli/scripts/install.template
rename to scripts/install.template
diff --git a/crates/ev-cli/scripts/update-versions.sh b/scripts/update-versions.sh
similarity index 100%
rename from crates/ev-cli/scripts/update-versions.sh
rename to scripts/update-versions.sh
diff --git a/crates/ev-cli/scripts/version.template b/scripts/version.template
similarity index 100%
rename from crates/ev-cli/scripts/version.template
rename to scripts/version.template