Skip to content

Commit

Permalink
Merge 7.7.1 (#58)
Browse files Browse the repository at this point in the history
## Description

Merge from Upstream/Release/7.7.1

AB#1611455

## Motivation and Context

Keeping OAuth2-Proxy up-to-date with the upstream

## How Has This Been Tested?

Created a local container image of the oauth-proxy from this PR and
integrated it with Reporting locally.
- run in the root of this repo
  - docker buildx build -t oauth-local .
- Updated FROM statement in pics/src/services/Oauth2Proxy/Dockerfile to 
  - FROM oauth-local

The following flows were checked:
- Login
- Audit logs
- Logout 


## Checklist:

- [x] Merge from Upstream/Release/7.7.1
  • Loading branch information
andersonvcv authored Dec 11, 2024
2 parents fb0723e + f321907 commit 9ce484b
Show file tree
Hide file tree
Showing 233 changed files with 8,549 additions and 22,648 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/vscode/devcontainers/go:1-1.21
FROM mcr.microsoft.com/vscode/devcontainers/go:1-1.22

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

Expand Down
45 changes: 45 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"name": "oauth2-proxy Dev",
"context": "..",
"dockerFile": "./Dockerfile",
"postCreateCommand": "pre-commit install && go mod download",
"containerEnv": { "DEVCONTAINER": "1" },
"appPort": ["4180:4180"],
"runArgs": ["-e", "GIT_EDITOR=code --wait"],
"customizations": {
"vscode": {
"extensions": [
"golang.go",
"ms-vscode.makefile-tools",
"visualstudioexptteam.vscodeintellicode",
"redhat.vscode-yaml",
"esbenp.prettier-vscode",
"GitHub.vscode-pull-request-github"
],
"settings": {
"editor.formatOnPaste": false,
"editor.formatOnSave": true,
"editor.formatOnType": true,
"files.trimTrailingWhitespace": true,
"yaml.customTags": [
"!input scalar",
"!secret scalar",
"!include_dir_named scalar",
"!include_dir_list scalar",
"!include_dir_merge_list scalar",
"!include_dir_merge_named scalar"
]
}
}
},
"features": {
"ghcr.io/devcontainers/features/docker-in-docker": {},
"ghcr.io/devcontainers/features/common-utils": {
"configureZshAsDefaultShell": true,
"username": "vscode",
"userUid": 1000,
"userGid": 1000
},
"ghcr.io/devcontainers/features/kubectl-helm-minikube": {}
}
}
37 changes: 0 additions & 37 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

72 changes: 72 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Bug report
description: Bug descriptions or unexpected behaviour
title: "[Bug]: <Short description>"
labels: ["bug","help wanted"]
body:
- type: input
attributes:
label: OAuth2-Proxy Version
description: Which version of oauth2-proxy are you using?
validations:
required: true
- type: dropdown
attributes:
label: Provider
description: Which identity provider are you using?
options:
- adfs
- azure
- bitbucket
- digitalocean
- facebook
- gitea
- github
- gitlab
- google
- keycloak
- keycloak-oidc
- linkedin
- logingov
- nextcloud
- oidc
validations:
required: false
- type: textarea
attributes:
label: Expected Behaviour
description: Tell us what you expect to happen.
validations:
required: true
- type: textarea
attributes:
label: Current Behaviour
description: Tell us what happens instead of the expected behavior.
validations:
required: true
- type: textarea
attributes:
label: Steps To Reproduce
description: Steps to reproduce the behavior.
placeholder: |
1. In this environment...
1. With this config...
1. Run '...'
1. See error...
validations:
required: true
- type: textarea
attributes:
label: Possible Solutions
description: Not obligatory, but suggest a fix/reason for the bug.
validations:
required: false
- type: textarea
attributes:
label: Configuration details or additional information
description: |
Please share more details about your environment and how you configured oauth2-proxy.
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false

6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
blank_issues_enabled: false
contact_links:
- name: OAuth2-Proxy Slack
url: https://gophers.slack.com/messages/CM2RSS25N
about: Feel free to ask any questions here.

60 changes: 60 additions & 0 deletions .github/ISSUE_TEMPLATE/configuration-support.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Configuration support
description: Configuration problems and overall requests on how to properly use oauth2-proxy.
title: "[Support]: <Short description>"
labels: ["configuration", "help wanted"]
body:
- type: input
attributes:
label: OAuth2-Proxy Version
description: Which version of oauth2-proxy are you using?
validations:
required: true
- type: dropdown
attributes:
label: Provider
description: Which identity provider are you using?
options:
- adfs
- azure
- bitbucket
- digitalocean
- facebook
- gitea
- github
- gitlab
- google
- keycloak
- keycloak-oidc
- linkedin
- logingov
- nextcloud
- oidc
validations:
required: true
- type: textarea
attributes:
label: Current Behaviour of your Problem
description: Tell us what you expect to happen and what happens instead.
validations:
required: true
- type: textarea
attributes:
label: Configuration details or additional information
description: |
Please share more details about your environment and how you configured oauth2-proxy.
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: true
- type: textarea
attributes:
label: Steps To Reproduce
description: Steps to reproduce the behavior.
placeholder: |
1. In this environment...
1. With this config...
1. Run '...'
1. See error...
validations:
required: false

50 changes: 50 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Feature request
description: Feature requests or proposals related to the overall project or specific providers
title: "[Feature]: <Short description>"
labels: ["enhancement"]
body:
- type: textarea
attributes:
label: Motivation
description: Tell us the motivation behind your feature request or proposal.
validations:
required: true
- type: textarea
attributes:
label: Possible solution
description: |
If you already have a possible solution in mind. Write some more details about it or add some pseudo code.
Tip 1: You can attach images or log files by clicking this area to highlight it and then dragging files in.
Tip 2: You can add code snippets in triple backtiks like so:
\`\`\`golang
func hello() {
fmt.Println("world")
}
\`\`\`
validations:
required: false
- type: dropdown
attributes:
label: Provider
description: Is it a feature request for a specific provider. Not mandatory.
options:
- new provider
- adfs
- azure
- bitbucket
- digitalocean
- facebook
- gitea
- github
- gitlab
- google
- keycloak
- keycloak-oidc
- linkedin
- logingov
- nextcloud
- oidc
validations:
required: false

1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@
- [ ] My change requires a change to the documentation or CHANGELOG.
- [ ] I have updated the documentation/CHANGELOG accordingly.
- [ ] I have created a feature (non-master) branch for my PR.
- [ ] I have written tests for my code changes.
35 changes: 35 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
go:
- changed-files:
- any-glob-to-any-file:
- '**/*.go'

docs:
- changed-files:
- any-glob-to-any-file:
- '**/*.md'

changelog:
- changed-files:
- any-glob-to-any-file:
- 'CHAGELOG.md'

tests:
- changed-files:
- any-glob-to-any-file:
- '**/*_test.go'

provider:
- changed-files:
- any-glob-to-any-file:
- 'providers/**/*'

dependencies:
- changed-files:
- any-glob-to-any-file:
- 'go.mod'
- 'go.sum'

docker:
- changed-files:
- any-glob-to-any-file:
- '**/Dockerfile'
58 changes: 58 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
$schema: "https://docs.renovatebot.com/renovate-schema.json",
semanticCommits: "enabled",
schedule: [
"after 8am on sunday"
],
prConcurrentLimit: 0,
prHourlyLimit: 0,
enabledManagers: [
"dockerfile",
"docker-compose",
"gomod",
"github-actions",
"helmv3",
"npm",
"regex",
],
packageRules: [
{
matchManagers: [
"dockerfile",
"docker-compose",
"gomod",
"helmv3",
"npm",
],
groupName: "{{{manager}}}",
},
{
matchDepNames: [
"docker.io/library/golang",
"mcr.microsoft.com/vscode/devcontainers/go",
],
groupName: "golang",
},
],
customManagers: [
{
customType: "regex",
fileMatch: [
"^Makefile",
],
matchStrings: [
"DOCKER_BUILD_RUNTIME_IMAGE_ALPINE\\s+?\\?= alpine:(?<currentValue>.*)\\s"
],
depNameTemplate: "alpine",
datasourceTemplate: "docker",
},
{
customType: "regex",
fileMatch: ["(^|/)\\.github/workflows/[^/]+\\.ya?ml$"],
matchStrings: [
"# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s+?[\\w\\s-]*?version: (?<currentValue>.*)\\s",
"# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s+?[\\w\\s]*?_VERSION: (?<currentValue>.*)\\s",
],
},
],
}
Loading

0 comments on commit 9ce484b

Please sign in to comment.