Merge pull request #145 from filecoin-project/feat/allocator-template-branch

Allocator template environment set

Author: clriesco

.github/workflows/deploy_to_prod.yml

@@ -52,7 +52,7 @@ jobs:
               "GH_PRIVATE_KEY": "${{secrets.GH_PRIVATE_KEY}}",
               "GITHUB_APP_ID": "${{vars.GH_APP_ID}}",
               "GITHUB_INSTALLATION_ID": "${{vars.GH_INSTALLATION_ID}}",
-              "FILPLUS_ENV": "prod",
+              "FILPLUS_ENV": "production",
               "RUST_LOG": "debug",
               "BOT_USER": "${{vars.BOT_USER}}",
               "BACKEND_URL": "${{vars.BACKEND_URL}}",

.github/workflows/deploy_to_staging.yml

@@ -70,7 +70,7 @@ jobs:
                 "DB_URL": "${{secrets.DB_URL}}",
                 "GITHUB_APP_ID": "${{vars.GH_APP_ID}}",
                 "GITHUB_INSTALLATION_ID": "${{vars.GH_INSTALLATION_ID}}",
-                "FILPLUS_ENV": "prod",
+                "FILPLUS_ENV": "staging",
                 "RUST_LOG": "debug",
                 "BOT_USER": "${{vars.BOT_USER}}",
                 "BACKEND_URL": "${{vars.BACKEND_URL}}",

fplus-lib/src/config.rs

@@ -17,6 +17,7 @@ pub fn default_env_vars() -> &'static HashMap<&'static str, &'static str> {
         m.insert("ALLOCATOR_GOVERNANCE_OWNER", "fidlabs");
         m.insert("BOT_USER", "filplus-allocators-staging-bot[bot]");
         m.insert("BACKEND_URL", "https://fp-core.dp04sa0tdc6pk.us-east-1.cs.amazonlightsail.com");
+        m.insert("FILPLUS_ENV", "staging");
 
         m
     })

fplus-lib/src/core/allocator/mod.rs

@@ -94,15 +94,17 @@ pub async fn is_allocator_repo_created(owner: &str, repo: &str) -> Result<bool,
 pub async fn create_allocator_repo(owner: &str, repo: &str) -> Result<(), LDNError> {
     let gh = github_async_new(owner.to_string(), repo.to_string()).await;
     let mut dirs = Vec::new();
-    let backend_url = get_env_var_or_default("BACKEND_URL");
-    gh.create_or_update_secret("BACKEND_URL", &backend_url).await.map_err(|e| {
-        LDNError::Load(format!("Failed to create or update secret in GitHub. Reason: {}", e))
-    })?;
+    let branch = match get_env_var_or_default("FILPLUS_ENV").as_str() {
+        "staging" => "staging",
+        "production" => "main",
+        _ => "main",
+    };
+
     dirs.push("".to_string());
 
     while dirs.len() > 0 {
         let dir = dirs.pop().unwrap();
-        let files_list = gh.get_files_from_public_repo("clriesco", "filplus-allocator-template", Some(&dir)).await.map_err(|e| {
+        let files_list = gh.get_files_from_public_repo("fidlabs", "allocator-template", branch, Some(&dir)).await.map_err(|e| {
             LDNError::Load(format!("Failed to retrieve all files from GitHub. Reason: {}", e))
         })?;
 

fplus-lib/src/external_services/github.rs

@@ -721,9 +721,9 @@ impl GithubWrapper {
         &self,
         owner: &str, 
         repo: &str, 
+        branch: &str,
         path: Option<&str>
     ) -> Result<ContentItems, OctocrabError> {
-        let branch = "main";
         let octocrab = Octocrab::builder().build()?;
         let gh = octocrab.repos(owner, repo);
 
@@ -735,57 +735,4 @@ impl GithubWrapper {
 
         Ok(contents_items)
     }
-
-    /**
-     * Create or update a secret in the repository
-     * This function will receive the secret name and value and will create or update the secret in the repository
-     * The secret value will be encrypted using the public key of the repository, as required by the GitHub API
-     * More information here: https://docs.github.com/en/rest/actions/secrets?apiVersion=2022-11-28#create-or-update-a-repository-secret
-     */
-    pub async fn create_or_update_secret(
-        &self,
-        secret_name: &str,
-        secret_value: &str,
-    ) -> Result<(), OctocrabError> {
-        let pk = self
-            .inner
-            .repos(&self.owner, &self.repo)
-            .secrets()
-            .get_public_key()
-            .await?;
-    
-        let pk_bytes = match decode(pk.key) {
-            Ok(bytes) => bytes,
-            Err(e) => {
-                log::error!("Failed to decode public key: {:?}", e);
-                return Ok(());
-            }
-        };
-        assert_eq!(pk_bytes.len(), sodium::crypto_box_PUBLICKEYBYTES as usize, "Invalid public key length");
-        //Create a buffer to store the encrypted secret
-        let mut encrypted_secret = vec![0u8; sodium::crypto_box_SEALBYTES as usize + secret_value.len()];
-        //Encrypt the secret using the public key
-        let _encrypt_res = unsafe {
-            sodium::crypto_box_seal(
-                encrypted_secret.as_mut_ptr(),
-                secret_value.as_ptr(),
-                secret_value.len() as u64,
-                pk_bytes.as_ptr(),
-            )
-        };
-        //Encode the encrypted secret to base64
-        let encrypted_secret_base64 = encode(&encrypted_secret);
-
-        //Encrypt using libsodium
-        let _create_secret_res = self
-            .inner
-            .repos(&self.owner, &self.repo)
-            .secrets()
-            .create_or_update_secret(secret_name, &CreateRepositorySecret{
-                key_id: &pk.key_id,
-                encrypted_value: &encrypted_secret_base64,
-            })
-            .await?;
-        Ok(())
-    }
 }