WIP
This commit is contained in:
@@ -8,6 +8,7 @@ import { generateHasDir, generateMD5, jjDecrypt, jjEncrypt } from "@helpers/cryp
|
|||||||
import { saveFileIfItChanged } from "@helpers/saveFileIfItChanged";
|
import { saveFileIfItChanged } from "@helpers/saveFileIfItChanged";
|
||||||
import * as YAML from "js-yaml";
|
import * as YAML from "js-yaml";
|
||||||
import { subRepositoryClean, subRepositoryPull, subRepositoryPushChanges } from "@helpers/gitSubRepoUtils";
|
import { subRepositoryClean, subRepositoryPull, subRepositoryPushChanges } from "@helpers/gitSubRepoUtils";
|
||||||
|
import moment from "moment";
|
||||||
|
|
||||||
const logger = makeJJlogger({
|
const logger = makeJJlogger({
|
||||||
filename: 'jj/cli/secrets.ts'
|
filename: 'jj/cli/secrets.ts'
|
||||||
@@ -133,6 +134,13 @@ const commitSecretMeta = async () => {
|
|||||||
const metadataSecretPathBase = `${process.env.JJ_WORKSPACE_DIR}/${metadataRepoFolderRelative}/metadata/${process.env.JJ_CLI_SELECTED_COMMIT}`
|
const metadataSecretPathBase = `${process.env.JJ_WORKSPACE_DIR}/${metadataRepoFolderRelative}/metadata/${process.env.JJ_CLI_SELECTED_COMMIT}`
|
||||||
const secretsBasePath = `${process.env.JJ_WORKSPACE_DIR}/${metadataRepoFolderRelative}/secretsHash`
|
const secretsBasePath = `${process.env.JJ_WORKSPACE_DIR}/${metadataRepoFolderRelative}/secretsHash`
|
||||||
|
|
||||||
|
const mainSecretMetaDataFilePath = `${process.env.JJ_WORKSPACE_DIR}/${metadataRepoFolderRelative}/secrets.yaml`
|
||||||
|
if (!fs.existsSync(mainSecretMetaDataFilePath)) {
|
||||||
|
await fs.writeFile(mainSecretMetaDataFilePath, YAML.dump({}, {}), "utf8")
|
||||||
|
}
|
||||||
|
const mainSecretMetaDataObj = YAML.load(await fs.readFile(mainSecretMetaDataFilePath, "utf8")) || {}
|
||||||
|
|
||||||
|
|
||||||
for (const environmentKey of environmentsKeys) {
|
for (const environmentKey of environmentsKeys) {
|
||||||
|
|
||||||
const envMetadataFolder = `${metadataSecretPathBase}/${environmentKey}`
|
const envMetadataFolder = `${metadataSecretPathBase}/${environmentKey}`
|
||||||
@@ -165,9 +173,20 @@ const commitSecretMeta = async () => {
|
|||||||
fs.copyFileSync(encryptedSecretFilePath, secretsHashFile)
|
fs.copyFileSync(encryptedSecretFilePath, secretsHashFile)
|
||||||
}
|
}
|
||||||
_.set(currentMetadataSecretsObj, `secrets.${environmentKey}.${secretFileNameWithoutExtension}`, encryptedSecretFileHash)
|
_.set(currentMetadataSecretsObj, `secrets.${environmentKey}.${secretFileNameWithoutExtension}`, encryptedSecretFileHash)
|
||||||
|
const currentSecretMdObj = _.get(mainSecretMetaDataObj, `['${secretFileNameWithoutExtension}']['${environmentKey}']['${encryptedSecretFileHash}']`, {})
|
||||||
|
_.set(
|
||||||
|
mainSecretMetaDataObj,
|
||||||
|
`['${secretFileNameWithoutExtension}']['${environmentKey}']['${encryptedSecretFileHash}']`,
|
||||||
|
{
|
||||||
|
...currentSecretMdObj,
|
||||||
|
timeOfInitiate: currentSecretMdObj?.timeOfInitiate ? currentSecretMdObj?.timeOfInitiate : moment().toISOString(),
|
||||||
|
firstCommit: currentSecretMdObj?.firstCommit ? currentSecretMdObj?.firstCommit : process.env.JJ_CLI_SELECTED_COMMIT,
|
||||||
|
}
|
||||||
|
)
|
||||||
await fs.writeFile(secretsMetadataPath, YAML.dump(currentMetadataSecretsObj, {}), "utf8")
|
await fs.writeFile(secretsMetadataPath, YAML.dump(currentMetadataSecretsObj, {}), "utf8")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
await fs.writeFile(mainSecretMetaDataFilePath, YAML.dump(mainSecretMetaDataObj, {}), "utf8")
|
||||||
await subRepositoryPushChanges(metadataRepoFolderRelative, metadataRepoBranch, `${process.env.JJ_CLI_SELECTED_COMMIT} ${process.env.JJ_GIT_USER_EMAIL} 'jj secrets commitSecretMeta'`)
|
await subRepositoryPushChanges(metadataRepoFolderRelative, metadataRepoBranch, `${process.env.JJ_CLI_SELECTED_COMMIT} ${process.env.JJ_GIT_USER_EMAIL} 'jj secrets commitSecretMeta'`)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user