Skip to content

Commit

Permalink
update herwinz
Browse files Browse the repository at this point in the history
  • Loading branch information
herwinz committed Nov 27, 2024
1 parent 7a343e6 commit 1954ada
Show file tree
Hide file tree
Showing 80 changed files with 376 additions and 376 deletions.
2 changes: 1 addition & 1 deletion CNAME
Original file line number Diff line number Diff line change
@@ -1 +1 @@
josh-ops.com
herwinz.github.io
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2020 Josh Johanning
Copyright (c) 2020 Herwindra Berlian

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# josh-ops.com
# herwinz.github.io

## Overview

A DevOps Blog - Blogging about GitHub and Azure DevOps practices, tips, scripts, and my continuous improvement DevOps journey.

[**josh-ops.com**](https://josh-ops.com)
[**herwinz.github.io**](https://herwinz.github.io)

[![Build and Deploy](https://github.com/joshjohanning/joshjohanning.github.io/actions/workflows/pages-deploy.yml/badge.svg?branch=main)](https://github.com/joshjohanning/joshjohanning.github.io/actions/workflows/pages-deploy.yml)
[![Build and Deploy](https://github.com/herwinz/herwinz.github.io/actions/workflows/pages-deploy.yml/badge.svg?branch=main)](https://github.com/herwinz/herwinz.github.io/actions/workflows/pages-deploy.yml)

## Theme Source

Expand All @@ -18,41 +18,41 @@ Chirpy:

## Comment System

- [Utterances](https://utteranc.es/) (configured [directly in Chirpy](https://github.com/joshjohanning/joshjohanning.github.io/blob/a54c9633e6cab32fd30dc69afc9ffd74857cbd8a/_config.yml#L84-L92)) which uses GitHub issues for post comments
- [Utterances](https://utteranc.es/) (configured [directly in Chirpy](https://github.com/herwinz/herwinz.github.io/blob/a54c9633e6cab32fd30dc69afc9ffd74857cbd8a/_config.yml#L84-L92)) which uses GitHub issues for post comments

## Deviations from Chirpy

### Adding Speaking tab

- Added a [speaking tab](https://josh-ops.com/speaking/) to capture my speaking engagements
- [Used an icon](https://github.com/joshjohanning/joshjohanning.github.io/blob/ab7bb6e3842189adf1dccc909e1e77b86b625d0a/_tabs/speaking.md?plain=1#L3) from [fontawesome](https://fontawesome.com/v4/icons/) for the link in the sidebar
- Added a [speaking tab](https://herwinz.github.io/speaking/) to capture my speaking engagements
- [Used an icon](https://github.com/herwinz/herwinz.github.io/blob/ab7bb6e3842189adf1dccc909e1e77b86b625d0a/_tabs/speaking.md?plain=1#L3) from [fontawesome](https://fontawesome.com/v4/icons/) for the link in the sidebar

### Light Mode Sidebar Background Color

- For my implementation of Chirpy v4.3.0 to v6.1.0, I [reverted](https://github.com/joshjohanning/joshjohanning.github.io/pull/8) the light mode sidebar background color to the pre-v4.3.0 color (blue/purple)
- When I updated from [Chirpy v6.1.0 to v6.3.0](https://github.com/joshjohanning/joshjohanning.github.io/pull/30), I decided to use the latest upstream values for the light mode sidebar background color (light gray)
- For my implementation of Chirpy v4.3.0 to v6.1.0, I [reverted](https://github.com/herwinz/herwinz.github.io/pull/8) the light mode sidebar background color to the pre-v4.3.0 color (blue/purple)
- When I updated from [Chirpy v6.1.0 to v6.3.0](https://github.com/herwinz/herwinz.github.io/pull/30), I decided to use the latest upstream values for the light mode sidebar background color (light gray)

#### Changelog

- See: [#8](https://github.com/joshjohanning/joshjohanning.github.io/pull/8) where I reverted to the pre-v4.3.0 color (blue/purple)
- In [#27](https://github.com/joshjohanning/joshjohanning.github.io/pull/27), I updated the `sidebar-active-color` property to the latest upstream value
- In [#30](https://github.com/joshjohanning/joshjohanning.github.io/pull/30), I reverted to the latest upstream values for light mode, which included a change to the `sidebar-bg` and `sidebar-muted-color` properties to bring in the light gray sidebar background color
- See: [#8](https://github.com/herwinz/herwinz.github.io/pull/8) where I reverted to the pre-v4.3.0 color (blue/purple)
- In [#27](https://github.com/herwinz/herwinz.github.io/pull/27), I updated the `sidebar-active-color` property to the latest upstream value
- In [#30](https://github.com/herwinz/herwinz.github.io/pull/30), I reverted to the latest upstream values for light mode, which included a change to the `sidebar-bg` and `sidebar-muted-color` properties to bring in the light gray sidebar background color

### Preview Images

- Chirpy [v5.4.0](https://github.com/cotes2020/jekyll-theme-chirpy/commit/4b6ccbcbccce27b9fcb035812efefe4eb69301cf) introduced a strict `40 / 21` (`1:91:1`) aspect ratio requirement for post's preview images such that they would be cropped if you used a different aspect ratio
- In prior versions, I removed this code so that the post's preview images would still render with their original size
- In June 2023, I updated most of the preview images with the new aspect ratio and [brought back](https://github.com/joshjohanning/joshjohanning.github.io/commit/1920dc7d98cbe11a6882ae0ec067fabccd64426b) preview images to the home page, but I still left out the `40 / 21;` line from the `post.scss` file to account for the images that weren't updated
- In June 2023, I updated most of the preview images with the new aspect ratio and [brought back](https://github.com/herwinz/herwinz.github.io/commit/1920dc7d98cbe11a6882ae0ec067fabccd64426b) preview images to the home page, but I still left out the `40 / 21;` line from the `post.scss` file to account for the images that weren't updated
- In November 2023, I updated to Chirpy v6.2.3 and the preview image logic was moved to `commons.scss`; removed the `40 / 21;` line for the non-updated images

#### Changelog

- Upstream commit introducing change: [4b6ccbc](https://github.com/cotes2020/jekyll-theme-chirpy/commit/4b6ccbcbccce27b9fcb035812efefe4eb69301cf) (Chirpy [v5.4.0](https://github.com/cotes2020/jekyll-theme-chirpy/releases/tag/v5.4.0))
- My changes so that preview image still shimmers before loading, but no image cropping: [b282712^..bb1dc1f](https://github.com/joshjohanning/joshjohanning.github.io/compare/b282712087028da95e292e3159d20cdf63d59feb^..bb1dc1f1bdbba4ee7d62858d834e0ca19f7745db)
- My changes so that preview image still shimmers before loading, but no image cropping: [b282712^..bb1dc1f](https://github.com/herwinz/herwinz.github.io/compare/b282712087028da95e292e3159d20cdf63d59feb^..bb1dc1f1bdbba4ee7d62858d834e0ca19f7745db)
- Really only need to get rid of `aspect-ratio: 40 / 21;` line
- June 20, 2023: [Updated](https://github.com/joshjohanning/joshjohanning.github.io/commit/af83c7019c5783f70d5e725991097a7217a6658a) most of the post images to reflect the `1.91:1` aspect ratio since that's the ratio the [home page expects](https://github.com/joshjohanning/joshjohanning.github.io/commit/1920dc7d98cbe11a6882ae0ec067fabccd64426b) for the post preview images
- June 20, 2023: [Updated](https://github.com/herwinz/herwinz.github.io/commit/af83c7019c5783f70d5e725991097a7217a6658a) most of the post images to reflect the `1.91:1` aspect ratio since that's the ratio the [home page expects](https://github.com/herwinz/herwinz.github.io/commit/1920dc7d98cbe11a6882ae0ec067fabccd64426b) for the post preview images
- I still left out the `40 / 21;` line in the `post.scss` file for the images I didn't update to show the original image size on the post page
- November 1, 2023: In Chirpy [v6.2.3](https://github.com/joshjohanning/joshjohanning.github.io/pull/30), the preview image logic was moved to `commons.scss`; removed the `40 / 21;` line for the non-updated images
- November 1, 2023: In Chirpy [v6.2.3](https://github.com/herwinz/herwinz.github.io/pull/30), the preview image logic was moved to `commons.scss`; removed the `40 / 21;` line for the non-updated images

## Upgrading the Theme

Expand All @@ -78,7 +78,7 @@ Since we aren't using the theme gem (so we can do customizations), we have to do
- If there are new files that we don't want to track, delete the files, commit, and run another rebase `git rebase -i HEAD~2`
- This command can help with tracking new files in the most recent commit: `git diff-tree --compact-summary -r HEAD --diff-filter=A`
9. Ensure commit signing is enabled: `git config commit.gpgsign true`
10. Update author and commit time: `git commit --amend --author "Josh Johanning <joshjohanning@github.com>" --date=now -S`
10. Update author and commit time: `git commit --amend --author "Herwindra Berlian <herwinz@github.com>" --date=now -S`
11. [Test changes locally before pushing](#building--testing-locally)

## Building / Testing Locally
Expand Down
26 changes: 13 additions & 13 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,39 +14,39 @@ timezone: America/Chicago
# jekyll-seo-tag settings › https://github.com/jekyll/jekyll-seo-tag/blob/master/docs/usage.md
# ↓ --------------------------

title: josh-ops # the main title
title: dev-ops # the main title

tagline: A DevOps Blog # it will display as the sub-title

description: >- # used by seo meta and the atom feed
Blogging about Azure DevOps and GitHub practices, tips, and my continuous improvement DevOps journey.
Blogging about Azure, AWS, GCP DevOps and GitHub practices, tips, and my continuous improvement DevOps journey.
# Fill in the protocol & hostname for your site.
# e.g. 'https://username.github.io', note that it does not end with a '/'.
url: "https://josh-ops.com"
url: "https://herwinz.github.io"

github:
username: joshjohanning # change to your github username
username: herwinz # change to your github username

twitter:
username: jjjettrain # change to your twitter username
username: herwinz # change to your twitter username

social:
# Change to your full name.
# It will be displayed as the default author of the posts and the copyright owner in the Footer
name: Josh Johanning
email: jjohanning@uwalumni.com # change to your email address
name: Herwindra Berlian
email: mherwindrab@gmail.com # change to your email address
links:
# The first element serves as the copyright owner's link
- https://github.com/joshjohanning # change to your github homepage
- https://twitter.com/jjjettrain # change to your twitter homepage
- https://github.com/herwinz # change to your github homepage
- https://twitter.com/herwinz # change to your twitter homepage
# Uncomment below to add more social links
# - https://www.facebook.com/username
- https://www.linkedin.com/in/joshua-johanning/
- https://www.linkedin.com/in/herwindra/

# Site Verification Settings
webmaster_verifications:
google: eTIC71VhPBtwll8rNv7qlXud1yJh6E88No39MdcM_MI # fill in your Google verification code
google: # fill in your Google verification code
bing: # fill in your Bing verification code
alexa: # fill in your Alexa verification code
yandex: # fill in your Yandex verification code
Expand All @@ -59,7 +59,7 @@ webmaster_verifications:
# Web Analytics Settings
analytics:
google:
id: "G-GE92ZJY22K" # fill in your Google Analytics ID
id: # fill in your Google Analytics ID
goatcounter:
id: # fill in your GoatCounter ID
umami:
Expand Down Expand Up @@ -115,7 +115,7 @@ comments:
shortname: # fill with the Disqus shortname. › https://help.disqus.com/en/articles/1717111-what-s-a-shortname
# utterances settings › https://utteranc.es/
utterances:
repo: joshjohanning/joshjohanning.github.io
repo: herwinz/herwinz.github.io
issue_term: title # < url | pathname | title | ...>
# Giscus options › https://giscus.app
giscus:
Expand Down
8 changes: 4 additions & 4 deletions _data/authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# url: {homepage_of_author}
# -------------------------------------

Josh Johanning:
name: Josh Johanning
twitter: jjjettrain
url: https://github.com/joshjohanning/
Herwindra Berlian:
name: Herwindra Berlian
twitter: herwinz
url: https://github.com/herwinz/
2 changes: 1 addition & 1 deletion _data/contact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#
- type: linkedin
icon: "fab fa-linkedin" # icons powered by <https://fontawesome.com/>
url: "https://www.linkedin.com/in/joshua-johanning/" # Fill with your Linkedin homepage
url: "https://www.linkedin.com/in/herwindra/" # Fill with your Linkedin homepage
#
# - type: stack-overflow
# icon: 'fab fa-stack-overflow'
Expand Down
30 changes: 15 additions & 15 deletions _posts/2020-12-08-extends-template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: 'Azure DevOps: Extends Template with Build and Deployment Templates'
author: Josh Johanning
DevOps Engineer
date: 2020-12-10 22:00:00 -0600
categories: [Azure DevOps, Pipelines]
tags: [Azure DevOps, Pipeline Templates]
Expand All @@ -17,8 +17,8 @@ resources:
repositories:
- repository: templates
type: github
name: joshjohanning/pipeline-templates
endpoint: joshjohanning
name: herwinz/pipeline-templates
endpoint: herwinz

stages:
- stage: 'Build'
Expand Down Expand Up @@ -46,7 +46,7 @@ I remember when this was first announced in a [sprint release note](https://docs
In this demo scenario, my code is stored in GitHub, but this could work just as well with code in Azure Repos as well.
### [`azure-pipelines.yml`{: .filepath}](https://github.com/joshjohanning/secrets-scanning-poc/blob/f07a2eae415f38933f506d4ed0c69f75df2ffb91/azure-pipelines.yml){: .filepath}
### [`azure-pipelines.yml`{: .filepath}](https://github.com/herwinz/secrets-scanning-poc/blob/f07a2eae415f38933f506d4ed0c69f75df2ffb91/azure-pipelines.yml){: .filepath}

In the root `azure-pipelines.yml`{: .filepath} file, you'll notice that the `extends` keyword is at the same level as `trigger` and `resources`. This was the tricky part - how does one use `extends` AND job templates? The approach is to use a *steps* template for the build where we want the extra steps injected, and for deployment we can use our *job* templates like normal. We will add an Environment check that ensures that the extends template is being used. If the Extends template isn't used, the check fails and the deployment isn't allowed.

Expand All @@ -62,8 +62,8 @@ resources:
repositories:
- repository: templates
type: github
name: joshjohanning/pipeline-templates
endpoint: joshjohanning
name: herwinz/pipeline-templates
endpoint: herwinz
extends:
template: secret-scanning/secret-scanning-extends.yml@templates
Expand All @@ -90,7 +90,7 @@ extends:
environment: github-secret-scanning-test-gate-prod
```

### [`secret-scanning-extends.yml`{: .filepath}](https://github.com/joshjohanning/pipeline-templates/blob/main/secret-scanning/secret-scanning-extends.yml)
### [`secret-scanning-extends.yml`{: .filepath}](https://github.com/herwinz/pipeline-templates/blob/main/secret-scanning/secret-scanning-extends.yml)

The `parameters` passed into the extends template include a `stepList` type for the `buildSteps` and a `stageList` for the `deployStages`.

Expand All @@ -111,8 +111,8 @@ resources:
repositories:
- repository: secretscanning
type: github
name: joshjohanning/secret-scanning-config
endpoint: joshjohanning
name: herwinz/secret-scanning-config
endpoint: herwinz
stages:
- stage: secure_buildstage
Expand All @@ -128,7 +128,7 @@ stages:
- ${{ parameters.deployStages }}
```

### [`sample-build-steps.yml`{: .filepath}](https://github.com/joshjohanning/pipeline-templates/blob/main/secret-scanning/sample-build-steps.yml)
### [`sample-build-steps.yml`{: .filepath}](https://github.com/herwinz/pipeline-templates/blob/main/secret-scanning/sample-build-steps.yml)

Not much crazy here - this is a *steps* template (as opposed to a *job* template). This is injected into the extends template in the `- ${{ parameters.buildSteps }}` line of code.

Expand All @@ -142,7 +142,7 @@ steps:
```

### [`sample-deployment-job.yml`{: .filepath}](https://github.com/joshjohanning/pipeline-templates/blob/main/secret-scanning/sample-deployment-job.yml)
### [`sample-deployment-job.yml`{: .filepath}](https://github.com/herwinz/pipeline-templates/blob/main/secret-scanning/sample-deployment-job.yml)

This is pretty vanilla as well - this *job* template is injected into the extends template in the `- ${{ parameters.deployStages }}` line of code.

Expand Down Expand Up @@ -223,8 +223,8 @@ resources:
repositories:
- repository: secretscanning
type: github
name: joshjohanning/secret-scanning-config
endpoint: joshjohanning
name: herwinz/secret-scanning-config
endpoint: herwinz
stages:
- stage: ${{ parameters.buildStageName }}
Expand Down Expand Up @@ -253,8 +253,8 @@ resources:
repositories:
- repository: templates
type: github
name: joshjohanning/pipeline-templates
endpoint: joshjohanning
name: herwinz/pipeline-templates
endpoint: herwinz
extends:
template: secret-scanning/secret-scanning-extends.yml@templates
Expand Down
6 changes: 3 additions & 3 deletions _posts/2020-12-16-github-codeql-pr.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: 'GitHub: Block Pull Request if Code Scanning Alerts Are Found'
author: Josh Johanning
DevOps Engineer
date: 2020-12-16 20:00:00 -0600
categories: [GitHub, Advanced Security]
tags: [GitHub, GitHub Actions, Pull Requests, CodeQL, GitHub Advanced Security, Policy Enforcement, Branch Protection Rules]
Expand Down Expand Up @@ -182,9 +182,9 @@ Note that we also have to add an `Upload Build Artifact` step in the `Analyze` j

Depending on the workflow, you may have to modify the `path` in the Upload task as well as the script. You can find out the relative path of the .sarif report by viewing the Actions' logs.

The entire workflow can be found in my [GitHub branch](https://github.com/joshjohanning/tailspin-spacegame-web-deploy/blob/2d4955b668ffde45a2f4ea6e742268a536249b27/.github/workflows/codeql-analysis.yml).
The entire workflow can be found in my [GitHub branch](https://github.com/herwinz/tailspin-spacegame-web-deploy/blob/2d4955b668ffde45a2f4ea6e742268a536249b27/.github/workflows/codeql-analysis.yml).

Because the `.sarif`{: .filepath} produced by the ShiftLeft analysis is slightly different and by default *doesn't* fail the job even with *errors*, I created a different workflow you can use to block pull requests if errors or warnings are found - see for [example](https://github.com/joshjohanning/azdo-terraform-tailspin/blob/05151b64818db1c4cabf5aaf51f0024c779d81f5/.github/workflows/shiftleft-analysis.yml).
Because the `.sarif`{: .filepath} produced by the ShiftLeft analysis is slightly different and by default *doesn't* fail the job even with *errors*, I created a different workflow you can use to block pull requests if errors or warnings are found - see for [example](https://github.com/herwinz/azdo-terraform-tailspin/blob/05151b64818db1c4cabf5aaf51f0024c779d81f5/.github/workflows/shiftleft-analysis.yml).

Now just like we did above, we can modify our branch rule to require the "Detect-Errors" job to finish successfully, as this job will run successfully if there are no errors/warnings.

Expand Down
4 changes: 2 additions & 2 deletions _posts/2020-12-20-nuget-pusher-script.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: 'Quickly Migrate NuGet Packages to a New Feed'
author: Josh Johanning
DevOps Engineer
date: 2020-12-23 16:45:00 -0600
categories: [Azure DevOps, Artifacts]
tags: [Azure DevOps, NuGet, Scripts, Migrations]
Expand Down Expand Up @@ -89,7 +89,7 @@ An example:
```bash
./nuget-pusher-script.sh \
azure-devops \
https://pkgs.dev.azure.com/jjohanning0798/_packaging/my-nuget-feed/nuget/v3/index.json \
https://pkgs.dev.azure.com/herwinz0798/_packaging/my-nuget-feed/nuget/v3/index.json \
xyz_my_pat
```

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: 'Authorize and Restore Azure Artifacts NuGet Packages in GitHub Actions'
author: Josh Johanning
DevOps Engineer
date: 2021-01-04 14:15:00 -0600
description: Authenticate to Azure Artifacts from GitHub Actions for builds and code scanning workflows
categories: [GitHub, Actions]
Expand Down
2 changes: 1 addition & 1 deletion _posts/2021-01-17-reparent-work-items.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: 'Azure DevOps: Bulk Reparent Work Items'
author: Josh Johanning
DevOps Engineer
date: 2021-01-17 16:30:00 -0600
categories: [Azure DevOps, Work Items]
tags: [Azure DevOps, Work Items, Scripts]
Expand Down
Loading

0 comments on commit 1954ada

Please sign in to comment.