Fixes from a full run-through by hectorsector · Pull Request #4 · githubtraining/security-strategy-essentials · GitHub
Skip to content
This repository was archived by the owner on Sep 1, 2022. It is now read-only.

Fixes from a full run-through#4

Merged
hectorsector merged 19 commits into
masterfrom
hectorsector-runthrough
Nov 12, 2019
Merged

Fixes from a full run-through#4
hectorsector merged 19 commits into
masterfrom
hectorsector-runthrough

Conversation

@hectorsector

@hectorsector hectorsector commented Nov 12, 2019

Copy link
Copy Markdown
Contributor

This PR contains my fixes from a full run-through of the course.

Closes #3

@github-learning-lab

Copy link
Copy Markdown

@github-learning-lab github-learning-lab Bot had a problem deploying to production November 12, 2019 19:34 Failure
@github-learning-lab

Copy link
Copy Markdown

🔴 There was an error parsing your config.yml file.

YAMLException: unknown tag !<!includes> at line 200, column 7:
          right: 'filename:.env'
          ^

@github-learning-lab github-learning-lab Bot had a problem deploying to production November 12, 2019 19:42 Failure
@github-learning-lab

Copy link
Copy Markdown

🔴 There was an error parsing your config.yml file.

YAMLException: unknown tag !<!includes> at line 200, column 7:
          right: 'filename:.env'
          ^


1. Since we cloned the repository earlier, let's run `git checkout master` to put us back on the master branch
1. Run `git pull` to update your local repository with the changes we merged from the contributor's pull request
1. Run `git filter-branch --index-filter "git rm -rf --cached --ignore-unmatch .env" HEAD` to remove the historical reference to the `.env` file

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@a-a-ron this command didn't get rid of the commits from my history 😢

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hectorsector this command doesn't remove the commit itself from the history but rather remove all content within the commit relating to the .env file

@hectorsector hectorsector marked this pull request as ready for review November 12, 2019 19:47
@hectorsector

Copy link
Copy Markdown
Contributor Author

@a-a-ron I've gone through this course and everything seems to work. I'd love your 👀 because I changed a fair amount of things, and a run through of the updated gates if you have the time.

The only exception to "everything works" is #4 (comment).

Comment thread config.yml
left: '848cd8c, 56d6fbb'
operator: test
left: '/(Add .env file)|(Remove .env file)/g'
operator: '!test'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @hectorsector, the previous command removes the commit contents relating to the .env file, it doesn't remove the entire commits from history. I had this validation against the original commit IDs because those would change with the command but i'm open to a better way for validation.

However, with this validation and because the commits along with their commit messages remain, I don't get the last bot response from this step that sends me to the congratulations issue.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK I understand now, that's not clear from the responses so I'll make those adjustments and then merge.

@a-a-ron

a-a-ron commented Nov 12, 2019

Copy link
Copy Markdown
Contributor

Thanks @hectorsector for making these changes! Everything looks great other than the last gate validation against the commits.

@hectorsector

Copy link
Copy Markdown
Contributor Author

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Step 7 won't complete

2 participants