WIP
This commit is contained in:
+7
-12
@@ -7,7 +7,7 @@ import path from "path";
|
|||||||
import { generateHasDir, generateMD5, jjDecrypt, jjEncrypt } from "@helpers/cryptoUtils";
|
import { generateHasDir, generateMD5, jjDecrypt, jjEncrypt } from "@helpers/cryptoUtils";
|
||||||
import { saveFileIfItChanged } from "@helpers/saveFileIfItChanged";
|
import { saveFileIfItChanged } from "@helpers/saveFileIfItChanged";
|
||||||
import * as YAML from "js-yaml";
|
import * as YAML from "js-yaml";
|
||||||
import { subRepositoryClean } from "@helpers/gitSubRepoUtils";
|
import { subRepositoryClean, subRepositoryPull, subRepositoryPushChanges } from "@helpers/gitSubRepoUtils";
|
||||||
|
|
||||||
const logger = makeJJlogger({
|
const logger = makeJJlogger({
|
||||||
filename: 'jj/cli/secrets.ts'
|
filename: 'jj/cli/secrets.ts'
|
||||||
@@ -119,7 +119,10 @@ const setSecretFile = async ({
|
|||||||
const commitSecretMeta = async () => {
|
const commitSecretMeta = async () => {
|
||||||
|
|
||||||
const metadataRepoFolderRelative = getJJConfigByKeyChain(`metadataRepo.path`)
|
const metadataRepoFolderRelative = getJJConfigByKeyChain(`metadataRepo.path`)
|
||||||
|
const metadataRepoBranch = getJJConfigByKeyChain(`metadataRepo.branch`)
|
||||||
await subRepositoryClean(metadataRepoFolderRelative)
|
await subRepositoryClean(metadataRepoFolderRelative)
|
||||||
|
await subRepositoryPull(metadataRepoFolderRelative, metadataRepoBranch)
|
||||||
|
|
||||||
|
|
||||||
logger.log(`commitSecretMeta for ${process.env.JJ_CLI_SELECTED_COMMIT} start`)
|
logger.log(`commitSecretMeta for ${process.env.JJ_CLI_SELECTED_COMMIT} start`)
|
||||||
|
|
||||||
@@ -163,19 +166,11 @@ const commitSecretMeta = async () => {
|
|||||||
}
|
}
|
||||||
_.set(currentMetadataSecretsObj, `secrets.${environmentKey}.${secretFileNameWithoutExtension}`, encryptedSecretFileHash)
|
_.set(currentMetadataSecretsObj, `secrets.${environmentKey}.${secretFileNameWithoutExtension}`, encryptedSecretFileHash)
|
||||||
await fs.writeFile(secretsMetadataPath, YAML.dump(currentMetadataSecretsObj, {}), "utf8")
|
await fs.writeFile(secretsMetadataPath, YAML.dump(currentMetadataSecretsObj, {}), "utf8")
|
||||||
|
|
||||||
// const secretHash = hash7((await generateDirectoryeHash(encryptedSecretFilePath)).hash)
|
|
||||||
// let secretName = jsonSourceFormatEncryptedSecret.split(".json")[0]
|
|
||||||
// const configSecretName = `${secretName}_${secretHash}`
|
|
||||||
// const configFile = `${environmentSecretsFolder}/${configSecretName}.json`
|
|
||||||
|
|
||||||
// if (!fs.existsSync(configFile)) {
|
|
||||||
// fs.copyFileSync(encryptedSecretFilePath, configFile)
|
|
||||||
// }
|
|
||||||
|
|
||||||
// _.set(currentCommitMetadataSecrets, `secrets.${environmentToPush}.${secretName}`, secretHash)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
await subRepositoryPushChanges(metadataRepoFolderRelative, metadataRepoBranch, `${process.env.JJ_CLI_SELECTED_COMMIT} ${process.env.JJ_GIT_USER_EMAIL} 'jj secrets commitSecretMeta'`)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
logger.success(`commitSecretMeta for ${process.env.JJ_CLI_SELECTED_COMMIT} done`)
|
logger.success(`commitSecretMeta for ${process.env.JJ_CLI_SELECTED_COMMIT} done`)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ export async function bashRunAndShowLogsPromise({
|
|||||||
if (!noError) {
|
if (!noError) {
|
||||||
reject()
|
reject()
|
||||||
}
|
}
|
||||||
|
resolve(data)
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
child.on('close', function (data) {
|
child.on('close', function (data) {
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { setTimeout } from "timers/promises"
|
||||||
import { bashRunAndReturnSync, bashRunAndShowLogsPromise } from "./bashUtils"
|
import { bashRunAndReturnSync, bashRunAndShowLogsPromise } from "./bashUtils"
|
||||||
import { makeJJlogger } from "./jjLogger"
|
import { makeJJlogger } from "./jjLogger"
|
||||||
|
|
||||||
@@ -26,4 +27,61 @@ popd > /dev/null
|
|||||||
logger.log(res)
|
logger.log(res)
|
||||||
|
|
||||||
logger.success(`clean repository ${repo} done`)
|
logger.success(`clean repository ${repo} done`)
|
||||||
}
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
export const subRepositoryPull = async (subRepoRelPath, branch, noLogger = false) => {
|
||||||
|
|
||||||
|
const repo = `${process.env.JJ_WORKSPACE_DIR}/${subRepoRelPath}`
|
||||||
|
if (!noLogger) {
|
||||||
|
logger.log(`pull repository ${repo} on ${branch} branch start`)
|
||||||
|
}
|
||||||
|
const command = `
|
||||||
|
pushd "${repo}" > /dev/null
|
||||||
|
git checkout ${branch} || true
|
||||||
|
git config pull.rebase false --replace-all || true
|
||||||
|
git pull origin || true
|
||||||
|
|
||||||
|
popd > /dev/null
|
||||||
|
`
|
||||||
|
const res = await bashRunAndReturnSync({
|
||||||
|
command: command
|
||||||
|
})
|
||||||
|
|
||||||
|
if (!noLogger) {
|
||||||
|
logger.log(res)
|
||||||
|
|
||||||
|
logger.success(`pull repository ${repo} on ${branch} branch done`)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export const subRepositoryPushChanges = async (subRepoRelPath, branch, commitMessage) => {
|
||||||
|
|
||||||
|
const repo = `${process.env.JJ_WORKSPACE_DIR}/${subRepoRelPath}`
|
||||||
|
logger.log(`push repository ${repo} on ${branch} branch "${commitMessage}" start`)
|
||||||
|
|
||||||
|
await subRepositoryPull(subRepoRelPath, branch)
|
||||||
|
await setTimeout(1000)
|
||||||
|
const command = `
|
||||||
|
pushd "${repo}" > /dev/null
|
||||||
|
git status || true
|
||||||
|
git add . || true
|
||||||
|
git status || true
|
||||||
|
|
||||||
|
git diff --cached --color | cat || true
|
||||||
|
git commit -m "${commitMessage}" || true
|
||||||
|
git push origin || true
|
||||||
|
popd > /dev/null
|
||||||
|
`
|
||||||
|
const res = await bashRunAndReturnSync({
|
||||||
|
command: command,
|
||||||
|
// noError: true
|
||||||
|
})
|
||||||
|
|
||||||
|
logger.log(res)
|
||||||
|
|
||||||
|
logger.success(`push repository ${repo} on ${branch} branch "${commitMessage}" done`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user