Skip to content

Commit

Permalink
Backport of chore: fix JIRA workflow into release/1.4.x (#617)
Browse files Browse the repository at this point in the history
no-op commit due to failed cherry-picking

Co-authored-by: temp <[email protected]>
  • Loading branch information
hc-github-team-consul-core and temp authored Sep 12, 2024
1 parent f1dc2c1 commit 58b9a3b
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/jira-issues.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ jobs:
# customfield_10089 is "Issue Link", customfield_10371 is "Source" (use JIRA API to retrieve)
extraFields: '{ "customfield_10089": "${{ github.event.issue.html_url || github.event.pull_request.html_url }}",
"customfield_10371": { "value": "GitHub" },
"customfield_10535": [{ "value": "Service Mesh" }],
"components": [{ "name": "${{ github.event.repository.name }}" }],
"labels": ${{ steps.set-ticket-labels.outputs.LABELS }} }'
env:
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/jira-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ jobs:
# customfield_10089 is "Issue Link", customfield_10371 is "Source" (use JIRA API to retrieve)
extraFields: '{ "customfield_10089": "${{ github.event.pull_request.html_url }}",
"customfield_10371": { "value": "GitHub" },
"customfield_10535": [{ "value": "Service Mesh" }],
"components": [{ "name": "${{ github.event.repository.name }}" }],
"labels": ${{ steps.set-ticket-labels.outputs.LABELS }} }'
env:
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
Expand Down
2 changes: 1 addition & 1 deletion pkg/consuldp/xds.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const (
func (cdp *ConsulDataplane) director(ctx context.Context, fullMethodName string) (context.Context, *grpc.ClientConn, error) {
// check to ensure other unknown/unregistered RPCs are not proxied to the target consul server.
if !strings.Contains(fullMethodName, envoyADSMethodName) {
return ctx, nil, status.Errorf(codes.Unimplemented, fmt.Sprintf("Unknown method %s", fullMethodName))
return ctx, nil, status.Errorf(codes.Unimplemented, "Unknown method %s", fullMethodName)
}

var mdCopy metadata.MD
Expand Down

0 comments on commit 58b9a3b

Please sign in to comment.