use of org.craftercms.studio.api.v2.utils.StudioConfiguration.REPO_INITIAL_COMMIT_COMMIT_MESSAGE in project studio by craftercms.
the class GitContentRepository method publish.
@RetryingOperation
@Override
public void publish(String site, String sandboxBranch, List<DeploymentItemTO> deploymentItems, String environment, String author, String comment) throws DeploymentException {
if (CollectionUtils.isEmpty(deploymentItems)) {
return;
}
String commitId = EMPTY;
String gitLockKey = SITE_PUBLISHED_REPOSITORY_GIT_LOCK.replaceAll(PATTERN_SITE, site);
generalLockService.lock(gitLockKey);
try {
GitRepositoryHelper helper = GitRepositoryHelper.getHelper(studioConfiguration, securityService, userServiceInternal, encryptor, generalLockService, retryingRepositoryOperationFacade);
Repository repo = helper.getRepository(site, PUBLISHED);
boolean repoCreated = false;
if (Objects.isNull(repo)) {
helper.createPublishedRepository(site, sandboxBranch);
repo = helper.getRepository(site, PUBLISHED);
repoCreated = Objects.nonNull(repo);
}
String path = EMPTY;
String sandboxBranchName = sandboxBranch;
if (StringUtils.isEmpty(sandboxBranchName)) {
sandboxBranchName = studioConfiguration.getProperty(REPO_SANDBOX_BRANCH);
}
synchronized (repo) {
try (Git git = new Git(repo)) {
String inProgressBranchName = environment + IN_PROGRESS_BRANCH_NAME_SUFFIX;
// fetch "origin/master"
logger.debug("Fetch from sandbox for site " + site);
FetchCommand fetchCommand = git.fetch();
retryingRepositoryOperationFacade.call(fetchCommand);
// checkout master and pull from sandbox
logger.debug("Checkout published/master branch for site " + site);
try {
// First delete it in case it already exists (ignored if does not exist)
String currentBranch = repo.getBranch();
if (currentBranch.endsWith(IN_PROGRESS_BRANCH_NAME_SUFFIX)) {
ResetCommand resetCommand = git.reset().setMode(HARD);
retryingRepositoryOperationFacade.call(resetCommand);
}
Ref ref = repo.exactRef(R_HEADS + sandboxBranchName);
boolean createBranch = (ref == null);
CheckoutCommand checkoutCommand = git.checkout().setName(sandboxBranchName).setCreateBranch(createBranch);
retryingRepositoryOperationFacade.call(checkoutCommand);
logger.debug("Delete in-progress branch, in case it was not cleaned up for site " + site);
DeleteBranchCommand deleteBranchCommand = git.branchDelete().setBranchNames(inProgressBranchName).setForce(true);
retryingRepositoryOperationFacade.call(deleteBranchCommand);
PullCommand pullCommand = git.pull().setRemote(DEFAULT_REMOTE_NAME).setRemoteBranchName(sandboxBranchName).setStrategy(THEIRS);
retryingRepositoryOperationFacade.call(pullCommand);
} catch (RefNotFoundException e) {
logger.error("Failed to checkout published master and to pull content from sandbox for site " + site, e);
throw new DeploymentException("Failed to checkout published master and to pull content from " + "sandbox for site " + site);
}
// checkout environment branch
logger.debug("Checkout environment branch " + environment + " for site " + site);
try {
CheckoutCommand checkoutCommand = git.checkout().setName(environment);
retryingRepositoryOperationFacade.call(checkoutCommand);
} catch (RefNotFoundException e) {
logger.info("Not able to find branch " + environment + " for site " + site + ". Creating new branch");
// create new environment branch
// it will start as empty orphan branch
CheckoutCommand checkoutCommand = git.checkout().setOrphan(true).setForceRefUpdate(true).setStartPoint(sandboxBranchName).setUpstreamMode(TRACK).setName(environment);
retryingRepositoryOperationFacade.call(checkoutCommand);
// remove any content to create empty branch
RmCommand rmcmd = git.rm();
File[] toDelete = repo.getWorkTree().listFiles();
for (File toDel : toDelete) {
if (!repo.getDirectory().equals(toDel) && !StringUtils.equals(toDel.getName(), DOT_GIT_IGNORE)) {
rmcmd.addFilepattern(toDel.getName());
}
}
retryingRepositoryOperationFacade.call(rmcmd);
CommitCommand commitCommand = git.commit().setMessage(helper.getCommitMessage(REPO_INITIAL_COMMIT_COMMIT_MESSAGE)).setAllowEmpty(true);
retryingRepositoryOperationFacade.call(commitCommand);
}
// Create in progress branch
try {
// Create in progress branch
logger.debug("Create in-progress branch for site " + site);
CheckoutCommand checkoutCommand = git.checkout().setCreateBranch(true).setForceRefUpdate(true).setStartPoint(environment).setUpstreamMode(TRACK).setName(inProgressBranchName);
retryingRepositoryOperationFacade.call(checkoutCommand);
} catch (GitAPIException e) {
// TODO: DB: Error ?
logger.error("Failed to create in-progress published branch for site " + site);
}
Set<String> deployedCommits = new HashSet<String>();
Set<String> deployedPackages = new HashSet<String>();
logger.debug("Checkout deployed files started.");
AddCommand addCommand = git.add();
for (DeploymentItemTO deploymentItem : deploymentItems) {
commitId = deploymentItem.getCommitId();
path = helper.getGitPath(deploymentItem.getPath());
if (Objects.isNull(commitId) || !commitIdExists(site, PUBLISHED, commitId)) {
if (contentExists(site, path)) {
if (Objects.isNull(commitId)) {
logger.warn("Commit ID is NULL for content " + path + ". Was the git repo reset at some point?");
} else {
logger.warn("Commit ID " + commitId + " does not exist for content " + path + ". Was the git repo reset at some point?");
}
logger.info("Publishing content from HEAD for " + path);
commitId = getRepoLastCommitId(site);
} else {
logger.warn("Skipping file " + path + " because commit id is null");
continue;
}
}
logger.debug("Checking out file " + path + " from commit id " + commitId + " for site " + site);
CheckoutCommand checkout = git.checkout();
checkout.setStartPoint(commitId).addPath(path);
retryingRepositoryOperationFacade.call(checkout);
if (deploymentItem.isMove()) {
if (!StringUtils.equals(deploymentItem.getPath(), deploymentItem.getOldPath())) {
String oldPath = helper.getGitPath(deploymentItem.getOldPath());
RmCommand rmCommand = git.rm().addFilepattern(oldPath).setCached(false);
retryingRepositoryOperationFacade.call(rmCommand);
cleanUpMoveFolders(git, oldPath);
}
}
if (deploymentItem.isDelete()) {
String deletePath = helper.getGitPath(deploymentItem.getPath());
boolean isPage = deletePath.endsWith(FILE_SEPARATOR + INDEX_FILE);
RmCommand rmCommand = git.rm().addFilepattern(deletePath).setCached(false);
retryingRepositoryOperationFacade.call(rmCommand);
Path parentToDelete = Paths.get(path).getParent();
deleteParentFolder(git, parentToDelete, isPage);
}
deployedCommits.add(commitId);
String packageId = deploymentItem.getPackageId();
if (StringUtils.isNotEmpty(packageId)) {
deployedPackages.add(deploymentItem.getPackageId());
}
addCommand.addFilepattern(path);
objectMetadataManager.updateLastPublishedDate(site, deploymentItem.getPath(), ZonedDateTime.now(UTC));
}
logger.debug("Checkout deployed files completed.");
// commit all deployed files
String commitMessage = studioConfiguration.getProperty(REPO_PUBLISHED_COMMIT_MESSAGE);
logger.debug("Get Author Ident started.");
User user = userServiceInternal.getUserByIdOrUsername(-1, author);
PersonIdent authorIdent = helper.getAuthorIdent(user);
logger.debug("Get Author Ident completed.");
logger.debug("Git add all published items started.");
retryingRepositoryOperationFacade.call(addCommand);
logger.debug("Git add all published items completed.");
commitMessage = commitMessage.replace("{username}", author);
commitMessage = commitMessage.replace("{datetime}", ZonedDateTime.now(UTC).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HHmmssSSSX")));
commitMessage = commitMessage.replace("{source}", "UI");
commitMessage = commitMessage.replace("{message}", comment);
StringBuilder sb = new StringBuilder();
for (String c : deployedCommits) {
sb.append(c).append(" ");
}
StringBuilder sbPackage = new StringBuilder();
for (String p : deployedPackages) {
sbPackage.append(p).append(" ");
}
commitMessage = commitMessage.replace("{commit_id}", sb.toString().trim());
commitMessage = commitMessage.replace("{package_id}", sbPackage.toString().trim());
logger.debug("Git commit all published items started.");
String prologue = studioConfiguration.getProperty(REPO_COMMIT_MESSAGE_PROLOGUE);
String postscript = studioConfiguration.getProperty(REPO_COMMIT_MESSAGE_POSTSCRIPT);
StringBuilder sbCommitMessage = new StringBuilder();
if (StringUtils.isNotEmpty(prologue)) {
sbCommitMessage.append(prologue).append("\n\n");
}
sbCommitMessage.append(commitMessage);
if (StringUtils.isNotEmpty(postscript)) {
sbCommitMessage.append("\n\n").append(postscript);
}
CommitCommand commitCommand = git.commit().setMessage(sbCommitMessage.toString()).setAuthor(authorIdent);
RevCommit revCommit = retryingRepositoryOperationFacade.call(commitCommand);
logger.debug("Git commit all published items completed.");
int commitTime = revCommit.getCommitTime();
// tag
ZonedDateTime tagDate2 = Instant.ofEpochSecond(commitTime).atZone(UTC);
ZonedDateTime publishDate = ZonedDateTime.now(UTC);
String tagName2 = tagDate2.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HHmmssSSSX")) + "_published_on_" + publishDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HHmmssSSSX"));
logger.debug("Get Author Ident started.");
PersonIdent authorIdent2 = helper.getAuthorIdent(user);
logger.debug("Get Author Ident completed.");
logger.debug("Git tag started.");
TagCommand tagCommand = git.tag().setTagger(authorIdent2).setName(tagName2).setMessage(commitMessage);
retryingRepositoryOperationFacade.call(tagCommand);
logger.debug("Git tag completed.");
// checkout environment
logger.debug("Checkout environment " + environment + " branch for site " + site);
CheckoutCommand checkoutCommand = git.checkout().setName(environment);
retryingRepositoryOperationFacade.call(checkoutCommand);
Ref branchRef = repo.findRef(inProgressBranchName);
// merge in-progress branch
logger.debug("Merge in-progress branch into environment " + environment + " for site " + site);
MergeCommand mergeCommand = git.merge().setCommit(true).include(branchRef);
retryingRepositoryOperationFacade.call(mergeCommand);
// clean up
logger.debug("Delete in-progress branch (clean up) for site " + site);
DeleteBranchCommand deleteBranchCommand = git.branchDelete().setBranchNames(inProgressBranchName).setForce(true);
retryingRepositoryOperationFacade.call(deleteBranchCommand);
git.close();
if (repoCreated) {
siteService.setPublishedRepoCreated(site);
}
}
}
} catch (Exception e) {
logger.error("Error when publishing site " + site + " to environment " + environment, e);
throw new DeploymentException("Error when publishing site " + site + " to environment " + environment + " [commit ID = " + commitId + "]");
} finally {
generalLockService.unlock(gitLockKey);
}
}
use of org.craftercms.studio.api.v2.utils.StudioConfiguration.REPO_INITIAL_COMMIT_COMMIT_MESSAGE in project studio by craftercms.
the class GitContentRepository method createSiteCloneRemote.
@Override
public boolean createSiteCloneRemote(String siteId, String sandboxBranch, String remoteName, String remoteUrl, String remoteBranch, boolean singleBranch, String authenticationType, String remoteUsername, String remotePassword, String remoteToken, String remotePrivateKey, Map<String, String> params, boolean createAsOrphan) throws InvalidRemoteRepositoryException, InvalidRemoteRepositoryCredentialsException, RemoteRepositoryNotFoundException, ServiceLayerException {
boolean toReturn = false;
// clone remote git repository for site content
logger.debug("Creating site " + siteId + " as a clone of remote repository " + remoteName + " (" + remoteUrl + ").");
String gitLockKey = SITE_SANDBOX_REPOSITORY_GIT_LOCK.replaceAll(PATTERN_SITE, siteId);
generalLockService.lock(gitLockKey);
try {
GitRepositoryHelper helper = GitRepositoryHelper.getHelper(studioConfiguration, securityService, userServiceInternal, encryptor, generalLockService, retryingRepositoryOperationFacade);
toReturn = helper.createSiteCloneRemoteGitRepo(siteId, sandboxBranch, remoteName, remoteUrl, remoteBranch, singleBranch, authenticationType, remoteUsername, remotePassword, remoteToken, remotePrivateKey, createAsOrphan);
if (toReturn) {
try {
if (createAsOrphan) {
removeRemote(siteId, remoteName);
} else {
insertRemoteToDb(siteId, remoteName, remoteUrl, authenticationType, remoteUsername, remotePassword, remoteToken, remotePrivateKey);
}
} catch (CryptoException e) {
throw new ServiceLayerException(e);
}
// update site name variable inside config files
logger.debug("Update site name configuration variables for site " + siteId);
toReturn = helper.updateSiteNameConfigVar(siteId);
if (toReturn) {
toReturn = helper.replaceParameters(siteId, params);
}
if (toReturn) {
// commit everything so it is visible
logger.debug("Perform initial commit for site " + siteId);
toReturn = helper.performInitialCommit(siteId, helper.getCommitMessage(REPO_INITIAL_COMMIT_COMMIT_MESSAGE), sandboxBranch);
}
} else {
logger.error("Error while creating site " + siteId + " by cloning remote repository " + remoteName + " (" + remoteUrl + ").");
}
} catch (CryptoException e) {
logger.error("Error while creating site " + siteId + " by cloning remote repository " + remoteName + " (" + remoteUrl + ").", e);
} finally {
generalLockService.unlock(gitLockKey);
}
return toReturn;
}
use of org.craftercms.studio.api.v2.utils.StudioConfiguration.REPO_INITIAL_COMMIT_COMMIT_MESSAGE in project studio by craftercms.
the class GitContentRepository method bootstrap.
/**
* bootstrap the repository
*/
public void bootstrap() throws Exception {
logger.debug("Bootstrap global repository.");
boolean bootstrapRepo = Boolean.parseBoolean(studioConfiguration.getProperty(BOOTSTRAP_REPO));
GitRepositoryHelper helper = GitRepositoryHelper.getHelper(studioConfiguration, securityService, userServiceInternal, encryptor, generalLockService, retryingRepositoryOperationFacade);
boolean isCreated = false;
HierarchicalConfiguration<ImmutableNode> registrationData = studioClusterUtils.getClusterConfiguration();
if (bootstrapRepo && registrationData != null && !registrationData.isEmpty()) {
String firstCommitId = getRepoFirstCommitId(StringUtils.EMPTY);
String localAddress = studioClusterUtils.getClusterNodeLocalAddress();
List<ClusterMember> clusterNodes = studioClusterUtils.getClusterNodes(localAddress);
if (StringUtils.isEmpty(firstCommitId)) {
logger.debug("Creating global repository as cluster clone");
isCreated = studioClusterUtils.cloneGlobalRepository(clusterNodes);
} else {
logger.debug("Global repository exists syncing with cluster siblings");
isCreated = true;
Repository repo = helper.getRepository(EMPTY, GLOBAL);
try (Git git = new Git(repo)) {
for (ClusterMember remoteNode : clusterNodes) {
if (remoteNode.getState().equals(ClusterMember.State.ACTIVE)) {
syncFromRemote(git, remoteNode);
}
}
}
}
}
if (bootstrapRepo && !isCreated && helper.createGlobalRepo()) {
// Copy the global config defaults to the global site
// Build a path to the bootstrap repo (the repo that ships with Studio)
String bootstrapFolderPath = this.ctx.getRealPath(FILE_SEPARATOR + BOOTSTRAP_REPO_PATH + FILE_SEPARATOR + BOOTSTRAP_REPO_GLOBAL_PATH);
Path source = java.nio.file.FileSystems.getDefault().getPath(bootstrapFolderPath);
logger.info("Bootstrapping with baseline @ " + source.toFile().toString());
// Copy the bootstrap repo to the global repo
Path globalConfigPath = helper.buildRepoPath(GLOBAL);
TreeCopier tc = new TreeCopier(source, globalConfigPath);
EnumSet<FileVisitOption> opts = EnumSet.of(FOLLOW_LINKS);
Files.walkFileTree(source, opts, MAX_VALUE, tc);
String studioManifestLocation = this.ctx.getRealPath(STUDIO_MANIFEST_LOCATION);
if (Files.exists(Paths.get(studioManifestLocation))) {
FileUtils.copyFile(Paths.get(studioManifestLocation).toFile(), Paths.get(globalConfigPath.toAbsolutePath().toString(), studioConfiguration.getProperty(BLUE_PRINTS_PATH), "BLUEPRINTS.MF").toFile());
}
Repository globalConfigRepo = helper.getRepository(EMPTY, GLOBAL);
try (Git git = new Git(globalConfigRepo)) {
Status status = git.status().call();
if (status.hasUncommittedChanges() || !status.isClean()) {
// Commit everything
// TODO: Consider what to do with the commitId in the future
AddCommand addCommand = git.add().addFilepattern(GIT_COMMIT_ALL_ITEMS);
retryingRepositoryOperationFacade.call(addCommand);
CommitCommand commitCommand = git.commit().setMessage(helper.getCommitMessage(REPO_INITIAL_COMMIT_COMMIT_MESSAGE));
retryingRepositoryOperationFacade.call(commitCommand);
}
} catch (GitAPIException err) {
logger.error("error creating initial commit for global configuration", err);
}
}
// Create global repository object
if (!helper.buildGlobalRepo()) {
logger.error("Failed to create global repository!");
}
}
use of org.craftercms.studio.api.v2.utils.StudioConfiguration.REPO_INITIAL_COMMIT_COMMIT_MESSAGE in project studio by craftercms.
the class GitContentRepository method createSiteFromBlueprint.
@Override
public boolean createSiteFromBlueprint(String blueprintLocation, String site, String sandboxBranch, Map<String, String> params) {
boolean toReturn;
String gitLockKey = SITE_SANDBOX_REPOSITORY_GIT_LOCK.replaceAll(PATTERN_SITE, site);
generalLockService.lock(gitLockKey);
try {
GitRepositoryHelper helper = GitRepositoryHelper.getHelper(studioConfiguration, securityService, userServiceInternal, encryptor, generalLockService, retryingRepositoryOperationFacade);
// create git repository for site content
toReturn = helper.createSandboxRepository(site, sandboxBranch);
if (toReturn) {
// copy files from blueprint
toReturn = helper.copyContentFromBlueprint(blueprintLocation, site);
}
if (toReturn) {
// update site name variable inside config files
toReturn = helper.updateSiteNameConfigVar(site);
}
if (toReturn) {
toReturn = helper.replaceParameters(site, params);
}
if (toReturn) {
toReturn = helper.addGitIgnoreFile(site);
}
if (toReturn) {
// commit everything so it is visible
toReturn = helper.performInitialCommit(site, helper.getCommitMessage(REPO_INITIAL_COMMIT_COMMIT_MESSAGE), sandboxBranch);
}
} catch (CryptoException e) {
logger.error("Error creating site from blueprint", e);
toReturn = false;
} finally {
generalLockService.unlock(gitLockKey);
}
return toReturn;
}
Aggregations