mirror of
https://gitea.com/gitea/tea.git
synced 2026-09-10 07:26:33 -04:00
Compare commits
17 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9c12138d62 | ||
|
|
4d09587d4c | ||
|
|
b2bab268d7 | ||
|
|
58931b5d17 | ||
|
|
c2947c23d9 | ||
|
|
8bfdec40c6 | ||
|
|
22d43ec9b6 | ||
|
|
bfda25be63 | ||
|
|
dfe89dfb6b | ||
|
|
ee531914cd | ||
|
|
276a4b735a | ||
|
|
943d4c1512 | ||
|
|
4233ebcbb1 | ||
|
|
12726f4c9b | ||
|
|
f34697c5ed | ||
|
|
a613a344de | ||
|
|
6435b12202 |
|
|
@ -8,15 +8,14 @@ jobs:
|
||||||
goreleaser:
|
goreleaser:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v7
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- run: git fetch --force --tags
|
- run: git fetch --force --tags
|
||||||
# Custom publishers (the R2 mirror below) run as the very last
|
# Custom publishers (the R2 upload below) run as the very last
|
||||||
# step of goreleaser's publish pipeline, after the Gitea release
|
# step of goreleaser's publish pipeline, after the Gitea release
|
||||||
# has already been created and every artifact already uploaded
|
# has already been created. Fail here instead, before anything
|
||||||
# to S3. Fail here instead, before anything is built or
|
# is built or published, if the R2 secrets are missing.
|
||||||
# published, if the R2 secrets are missing.
|
|
||||||
- name: check R2 configuration
|
- name: check R2 configuration
|
||||||
run: sh scripts/upload-r2.sh --check-config
|
run: sh scripts/upload-r2.sh --check-config
|
||||||
env:
|
env:
|
||||||
|
|
@ -24,12 +23,13 @@ jobs:
|
||||||
R2_BUCKET: ${{ secrets.R2_BUCKET }}
|
R2_BUCKET: ${{ secrets.R2_BUCKET }}
|
||||||
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
|
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
|
||||||
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
|
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
|
||||||
- uses: actions/setup-go@v6
|
- uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7
|
||||||
with:
|
with:
|
||||||
go-version-file: "go.mod"
|
go-version-file: "go.mod"
|
||||||
|
check-latest: true
|
||||||
- name: import gpg
|
- name: import gpg
|
||||||
id: import_gpg
|
id: import_gpg
|
||||||
uses: crazy-max/ghaction-import-gpg@v7
|
uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd # v7
|
||||||
with:
|
with:
|
||||||
gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
|
gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
|
||||||
passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
|
passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
|
||||||
|
|
@ -37,7 +37,7 @@ jobs:
|
||||||
id: sdk_version
|
id: sdk_version
|
||||||
run: echo "version=$(go list -f '{{.Version}}' -m gitea.dev/sdk)" >> "$GITHUB_OUTPUT"
|
run: echo "version=$(go list -f '{{.Version}}' -m gitea.dev/sdk)" >> "$GITHUB_OUTPUT"
|
||||||
- name: goreleaser
|
- name: goreleaser
|
||||||
uses: goreleaser/goreleaser-action@v7
|
uses: goreleaser/goreleaser-action@f06c13b6b1a9625abc9e6e439d9c05a8f2190e94 # v7
|
||||||
with:
|
with:
|
||||||
distribution: goreleaser-pro
|
distribution: goreleaser-pro
|
||||||
version: "~> v2"
|
version: "~> v2"
|
||||||
|
|
@ -45,11 +45,6 @@ jobs:
|
||||||
env:
|
env:
|
||||||
SDK_VERSION: ${{ steps.sdk_version.outputs.version }}
|
SDK_VERSION: ${{ steps.sdk_version.outputs.version }}
|
||||||
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
|
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
|
||||||
AWS_REGION: ${{ secrets.AWS_REGION }}
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
|
||||||
S3_REGION: ${{ secrets.AWS_REGION }}
|
|
||||||
S3_BUCKET: ${{ secrets.AWS_BUCKET }}
|
|
||||||
R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}
|
R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}
|
||||||
R2_BUCKET: ${{ secrets.R2_BUCKET }}
|
R2_BUCKET: ${{ secrets.R2_BUCKET }}
|
||||||
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
|
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
|
||||||
|
|
@ -65,24 +60,24 @@ jobs:
|
||||||
DOCKER_LATEST: nightly
|
DOCKER_LATEST: nightly
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v7
|
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0 # all history for all branches and tags
|
fetch-depth: 0 # all history for all branches and tags
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v4
|
uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4
|
||||||
|
|
||||||
- name: Set up Docker BuildX
|
- name: Set up Docker BuildX
|
||||||
uses: docker/setup-buildx-action@v4
|
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
|
||||||
|
|
||||||
- name: Login to DockerHub
|
- name: Login to DockerHub
|
||||||
uses: docker/login-action@v4
|
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@v7
|
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7
|
||||||
env:
|
env:
|
||||||
ACTIONS_RUNTIME_TOKEN: '' # See https://gitea.com/gitea/act_runner/issues/119
|
ACTIONS_RUNTIME_TOKEN: '' # See https://gitea.com/gitea/act_runner/issues/119
|
||||||
with:
|
with:
|
||||||
|
|
|
||||||
|
|
@ -9,15 +9,14 @@ jobs:
|
||||||
goreleaser:
|
goreleaser:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v7
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- run: git fetch --force --tags
|
- run: git fetch --force --tags
|
||||||
# Custom publishers (the R2 mirror below) run as the very last
|
# Custom publishers (the R2 upload below) run as the very last
|
||||||
# step of goreleaser's publish pipeline, after the Gitea release
|
# step of goreleaser's publish pipeline, after the Gitea release
|
||||||
# has already been created and every artifact already uploaded
|
# has already been created. Fail here instead, before anything
|
||||||
# to S3. Fail here instead, before anything is built or
|
# is built or published, if the R2 secrets are missing.
|
||||||
# published, if the R2 secrets are missing.
|
|
||||||
- name: check R2 configuration
|
- name: check R2 configuration
|
||||||
run: sh scripts/upload-r2.sh --check-config
|
run: sh scripts/upload-r2.sh --check-config
|
||||||
env:
|
env:
|
||||||
|
|
@ -25,12 +24,13 @@ jobs:
|
||||||
R2_BUCKET: ${{ secrets.R2_BUCKET }}
|
R2_BUCKET: ${{ secrets.R2_BUCKET }}
|
||||||
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
|
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
|
||||||
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
|
R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
|
||||||
- uses: actions/setup-go@v6
|
- uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7
|
||||||
with:
|
with:
|
||||||
go-version-file: 'go.mod'
|
go-version-file: 'go.mod'
|
||||||
|
check-latest: true
|
||||||
- name: import gpg
|
- name: import gpg
|
||||||
id: import_gpg
|
id: import_gpg
|
||||||
uses: crazy-max/ghaction-import-gpg@v7
|
uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd # v7
|
||||||
with:
|
with:
|
||||||
gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
|
gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
|
||||||
passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
|
passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
|
||||||
|
|
@ -38,7 +38,7 @@ jobs:
|
||||||
id: sdk_version
|
id: sdk_version
|
||||||
run: echo "version=$(go list -f '{{.Version}}' -m gitea.dev/sdk)" >> "$GITHUB_OUTPUT"
|
run: echo "version=$(go list -f '{{.Version}}' -m gitea.dev/sdk)" >> "$GITHUB_OUTPUT"
|
||||||
- name: goreleaser
|
- name: goreleaser
|
||||||
uses: goreleaser/goreleaser-action@v7
|
uses: goreleaser/goreleaser-action@f06c13b6b1a9625abc9e6e439d9c05a8f2190e94 # v7
|
||||||
with:
|
with:
|
||||||
distribution: goreleaser-pro
|
distribution: goreleaser-pro
|
||||||
version: "~> v2"
|
version: "~> v2"
|
||||||
|
|
@ -46,11 +46,6 @@ jobs:
|
||||||
env:
|
env:
|
||||||
SDK_VERSION: ${{ steps.sdk_version.outputs.version }}
|
SDK_VERSION: ${{ steps.sdk_version.outputs.version }}
|
||||||
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
|
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
|
||||||
AWS_REGION: ${{ secrets.AWS_REGION }}
|
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
|
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
|
|
||||||
S3_REGION: ${{ secrets.AWS_REGION }}
|
|
||||||
S3_BUCKET: ${{ secrets.AWS_BUCKET }}
|
|
||||||
R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}
|
R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}
|
||||||
R2_BUCKET: ${{ secrets.R2_BUCKET }}
|
R2_BUCKET: ${{ secrets.R2_BUCKET }}
|
||||||
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
|
R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
|
||||||
|
|
@ -66,18 +61,18 @@ jobs:
|
||||||
DOCKER_LATEST: nightly
|
DOCKER_LATEST: nightly
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v7
|
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0 # all history for all branches and tags
|
fetch-depth: 0 # all history for all branches and tags
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v4
|
uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4
|
||||||
|
|
||||||
- name: Set up Docker BuildX
|
- name: Set up Docker BuildX
|
||||||
uses: docker/setup-buildx-action@v4
|
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
|
||||||
|
|
||||||
- name: Login to DockerHub
|
- name: Login to DockerHub
|
||||||
uses: docker/login-action@v4
|
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
|
@ -87,7 +82,7 @@ jobs:
|
||||||
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
|
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@v7
|
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7
|
||||||
env:
|
env:
|
||||||
ACTIONS_RUNTIME_TOKEN: '' # See https://gitea.com/gitea/act_runner/issues/119
|
ACTIONS_RUNTIME_TOKEN: '' # See https://gitea.com/gitea/act_runner/issues/119
|
||||||
with:
|
with:
|
||||||
|
|
|
||||||
|
|
@ -16,10 +16,11 @@ jobs:
|
||||||
name: Lint Build And Unit Coverage
|
name: Lint Build And Unit Coverage
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v7
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
|
||||||
- uses: actions/setup-go@v6
|
- uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7
|
||||||
with:
|
with:
|
||||||
go-version-file: 'go.mod'
|
go-version-file: 'go.mod'
|
||||||
|
check-latest: true
|
||||||
- name: lint and build
|
- name: lint and build
|
||||||
run: |
|
run: |
|
||||||
make clean
|
make clean
|
||||||
|
|
@ -41,10 +42,11 @@ jobs:
|
||||||
GITEA_TEA_TEST_USERNAME: "test01"
|
GITEA_TEA_TEST_USERNAME: "test01"
|
||||||
GITEA_TEA_TEST_PASSWORD: "test01"
|
GITEA_TEA_TEST_PASSWORD: "test01"
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v7
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
|
||||||
- uses: actions/setup-go@v6
|
- uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7
|
||||||
with:
|
with:
|
||||||
go-version-file: 'go.mod'
|
go-version-file: 'go.mod'
|
||||||
|
check-latest: true
|
||||||
- name: wait for the gitea instance to be ready
|
- name: wait for the gitea instance to be ready
|
||||||
run: |
|
run: |
|
||||||
for i in $(seq 1 30); do
|
for i in $(seq 1 30); do
|
||||||
|
|
|
||||||
|
|
@ -76,24 +76,13 @@ builds:
|
||||||
- cmd: sh .goreleaser.checksum.sh {{ .Path }}
|
- cmd: sh .goreleaser.checksum.sh {{ .Path }}
|
||||||
- cmd: sh .goreleaser.checksum.sh {{ .Path }}.xz
|
- cmd: sh .goreleaser.checksum.sh {{ .Path }}.xz
|
||||||
|
|
||||||
blobs:
|
# Uploads the release artifacts to Cloudflare R2. A `blobs:` entry is
|
||||||
-
|
# not used here since the blob pipe authenticates from the global
|
||||||
provider: s3
|
# AWS_* env with no per-entry credentials; `publishers:` supports
|
||||||
bucket: "{{ .Env.S3_BUCKET }}"
|
# per-entry `env:` instead, so it's used to invoke
|
||||||
region: "{{ .Env.S3_REGION }}"
|
# scripts/upload-r2.sh once per artifact. Custom publishers inherit
|
||||||
directory: "tea/{{.Version}}"
|
# almost nothing from the environment, hence the explicit R2_*
|
||||||
extra_files:
|
# forwarding below.
|
||||||
- glob: ./**.xz
|
|
||||||
- glob: ./**.sha256
|
|
||||||
|
|
||||||
# Mirrors the S3 `blobs:` upload above into Cloudflare R2 during the
|
|
||||||
# parallel S3+R2 period (S3 will be removed once migration completes).
|
|
||||||
# A second `blobs:` entry is impossible here since the blob pipe
|
|
||||||
# authenticates from the global AWS_* env with no per-entry
|
|
||||||
# credentials; `publishers:` supports per-entry `env:` instead, so
|
|
||||||
# it's used to invoke scripts/upload-r2.sh once per artifact. Custom
|
|
||||||
# publishers inherit almost nothing from the environment, hence the
|
|
||||||
# explicit R2_* forwarding below.
|
|
||||||
#
|
#
|
||||||
# This publisher fires more than once per distinct key because
|
# This publisher fires more than once per distinct key because
|
||||||
# goreleaser's release pipe already registers `release.extra_files`
|
# goreleaser's release pipe already registers `release.extra_files`
|
||||||
|
|
|
||||||
5
Makefile
5
Makefile
|
|
@ -118,7 +118,12 @@ unit-test-coverage:
|
||||||
|
|
||||||
.PHONY: tidy
|
.PHONY: tidy
|
||||||
tidy:
|
tidy:
|
||||||
|
$(eval GO_TOOLCHAIN := $(shell grep -Eo '^toolchain\s+go[0-9.]+' go.mod | cut -d' ' -f2))
|
||||||
$(GO) mod tidy
|
$(GO) mod tidy
|
||||||
|
@# workaround https://github.com/golang/go/issues/75331: restore toolchain if tidy dropped it
|
||||||
|
@if [ -n "$(GO_TOOLCHAIN)" ] && ! grep -qE '^toolchain\s' go.mod; then \
|
||||||
|
$(GO) mod edit -toolchain=$(GO_TOOLCHAIN); \
|
||||||
|
fi
|
||||||
|
|
||||||
.PHONY: check
|
.PHONY: check
|
||||||
check: test
|
check: test
|
||||||
|
|
|
||||||
73
cmd/flags/body.go
Normal file
73
cmd/flags/body.go
Normal file
|
|
@ -0,0 +1,73 @@
|
||||||
|
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package flags
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"golang.org/x/term"
|
||||||
|
)
|
||||||
|
|
||||||
|
// stdinPiped reports whether stdin is not a terminal, e.g. when a description
|
||||||
|
// is piped from a file, command substitution, or a CI harness.
|
||||||
|
func stdinPiped() bool {
|
||||||
|
return !term.IsTerminal(int(os.Stdin.Fd()))
|
||||||
|
}
|
||||||
|
|
||||||
|
// resolveCreateBody returns the issue/PR description for create commands.
|
||||||
|
//
|
||||||
|
// Precedence:
|
||||||
|
// 1. --description-file (read from the file, or stdin when the path is "-")
|
||||||
|
// 2. --description
|
||||||
|
// 3. piped stdin
|
||||||
|
func resolveCreateBody(description, descriptionFile string, descriptionFileSet, stdinPiped bool, stdin io.Reader) (string, error) {
|
||||||
|
if descriptionFileSet {
|
||||||
|
return readDescriptionSource(descriptionFile, stdin)
|
||||||
|
}
|
||||||
|
if description != "" {
|
||||||
|
return description, nil
|
||||||
|
}
|
||||||
|
if stdinPiped {
|
||||||
|
return readDescriptionStdin(stdin)
|
||||||
|
}
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// resolveEditBody returns the new issue/PR body when a description flag was
|
||||||
|
// provided, or nil when the caller should leave the body unchanged.
|
||||||
|
func resolveEditBody(description string, descriptionSet bool, descriptionFile string, descriptionFileSet bool, stdin io.Reader) (*string, error) {
|
||||||
|
if descriptionFileSet {
|
||||||
|
body, err := readDescriptionSource(descriptionFile, stdin)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &body, nil
|
||||||
|
}
|
||||||
|
if descriptionSet {
|
||||||
|
body := description
|
||||||
|
return &body, nil
|
||||||
|
}
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func readDescriptionSource(source string, stdin io.Reader) (string, error) {
|
||||||
|
if source == "-" {
|
||||||
|
return readDescriptionStdin(stdin)
|
||||||
|
}
|
||||||
|
data, err := os.ReadFile(source)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("could not read description file %q: %w", source, err)
|
||||||
|
}
|
||||||
|
return string(data), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func readDescriptionStdin(stdin io.Reader) (string, error) {
|
||||||
|
data, err := io.ReadAll(stdin)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("could not read description from stdin: %w", err)
|
||||||
|
}
|
||||||
|
return string(data), nil
|
||||||
|
}
|
||||||
161
cmd/flags/body_test.go
Normal file
161
cmd/flags/body_test.go
Normal file
|
|
@ -0,0 +1,161 @@
|
||||||
|
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package flags
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestResolveCreateBody(t *testing.T) {
|
||||||
|
file := filepath.Join(t.TempDir(), "body.md")
|
||||||
|
require.NoError(t, os.WriteFile(file, []byte("from file"), 0o600))
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
description string
|
||||||
|
descriptionFile string
|
||||||
|
descriptionFileSet bool
|
||||||
|
stdinPiped bool
|
||||||
|
stdin string
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "description flag",
|
||||||
|
description: "from -d",
|
||||||
|
want: "from -d",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "description file",
|
||||||
|
descriptionFile: file,
|
||||||
|
descriptionFileSet: true,
|
||||||
|
want: "from file",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "description file wins over description",
|
||||||
|
description: "from -d",
|
||||||
|
descriptionFile: file,
|
||||||
|
descriptionFileSet: true,
|
||||||
|
want: "from file",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "dash reads stdin",
|
||||||
|
descriptionFile: "-",
|
||||||
|
descriptionFileSet: true,
|
||||||
|
stdin: "from stdin",
|
||||||
|
want: "from stdin",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "description wins over piped stdin",
|
||||||
|
description: "from -d",
|
||||||
|
stdinPiped: true,
|
||||||
|
stdin: "from stdin",
|
||||||
|
want: "from -d",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "piped stdin",
|
||||||
|
stdinPiped: true,
|
||||||
|
stdin: "from stdin",
|
||||||
|
want: "from stdin",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "empty description falls back to piped stdin",
|
||||||
|
description: "",
|
||||||
|
stdinPiped: true,
|
||||||
|
stdin: "from stdin",
|
||||||
|
want: "from stdin",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "empty when no source provided",
|
||||||
|
want: "",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
got, err := resolveCreateBody(tt.description, tt.descriptionFile, tt.descriptionFileSet, tt.stdinPiped, strings.NewReader(tt.stdin))
|
||||||
|
require.NoError(t, err)
|
||||||
|
assert.Equal(t, tt.want, got)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestResolveEditBody(t *testing.T) {
|
||||||
|
file := filepath.Join(t.TempDir(), "body.md")
|
||||||
|
require.NoError(t, os.WriteFile(file, []byte("from file"), 0o600))
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
description string
|
||||||
|
descriptionSet bool
|
||||||
|
descriptionFile string
|
||||||
|
descriptionFileSet bool
|
||||||
|
stdin string
|
||||||
|
wantBody string
|
||||||
|
wantSet bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "no description flag",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "description flag",
|
||||||
|
description: "from -d",
|
||||||
|
descriptionSet: true,
|
||||||
|
wantBody: "from -d",
|
||||||
|
wantSet: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "empty description clears body",
|
||||||
|
descriptionSet: true,
|
||||||
|
wantSet: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "description file",
|
||||||
|
descriptionFile: file,
|
||||||
|
descriptionFileSet: true,
|
||||||
|
wantBody: "from file",
|
||||||
|
wantSet: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "description file wins over description",
|
||||||
|
description: "from -d",
|
||||||
|
descriptionSet: true,
|
||||||
|
descriptionFile: file,
|
||||||
|
descriptionFileSet: true,
|
||||||
|
wantBody: "from file",
|
||||||
|
wantSet: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "dash reads stdin",
|
||||||
|
descriptionFile: "-",
|
||||||
|
descriptionFileSet: true,
|
||||||
|
stdin: "from stdin",
|
||||||
|
wantBody: "from stdin",
|
||||||
|
wantSet: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
got, err := resolveEditBody(tt.description, tt.descriptionSet, tt.descriptionFile, tt.descriptionFileSet, strings.NewReader(tt.stdin))
|
||||||
|
require.NoError(t, err)
|
||||||
|
if !tt.wantSet {
|
||||||
|
assert.Nil(t, got)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
require.NotNil(t, got)
|
||||||
|
assert.Equal(t, tt.wantBody, *got)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestResolveDescriptionSourceError(t *testing.T) {
|
||||||
|
_, err := resolveCreateBody("", filepath.Join(t.TempDir(), "missing.md"), true, false, strings.NewReader(""))
|
||||||
|
require.ErrorContains(t, err, "could not read description file")
|
||||||
|
}
|
||||||
|
|
@ -100,6 +100,10 @@ var issuePRFlags = append([]cli.Flag{
|
||||||
Name: "description",
|
Name: "description",
|
||||||
Aliases: []string{"d"},
|
Aliases: []string{"d"},
|
||||||
},
|
},
|
||||||
|
&cli.StringFlag{
|
||||||
|
Name: "description-file",
|
||||||
|
Usage: "Read description from file ('-' for stdin)",
|
||||||
|
},
|
||||||
&cli.StringFlag{
|
&cli.StringFlag{
|
||||||
Name: "referenced-version",
|
Name: "referenced-version",
|
||||||
Aliases: []string{"v"},
|
Aliases: []string{"v"},
|
||||||
|
|
@ -133,12 +137,22 @@ var IssuePRCreateFlags = append([]cli.Flag{
|
||||||
|
|
||||||
// GetIssuePRCreateFlags parses all IssuePREditFlags
|
// GetIssuePRCreateFlags parses all IssuePREditFlags
|
||||||
func GetIssuePRCreateFlags(requestCtx stdctx.Context, ctx *context.TeaContext) (*gitea.CreateIssueOption, error) {
|
func GetIssuePRCreateFlags(requestCtx stdctx.Context, ctx *context.TeaContext) (*gitea.CreateIssueOption, error) {
|
||||||
|
body, err := resolveCreateBody(
|
||||||
|
ctx.String("description"),
|
||||||
|
ctx.String("description-file"),
|
||||||
|
ctx.IsSet("description-file"),
|
||||||
|
stdinPiped(),
|
||||||
|
ctx.Reader,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
opts := gitea.CreateIssueOption{
|
opts := gitea.CreateIssueOption{
|
||||||
Title: ctx.String("title"),
|
Title: ctx.String("title"),
|
||||||
Body: ctx.String("description"),
|
Body: body,
|
||||||
Assignees: strings.Split(ctx.String("assignees"), ","),
|
Assignees: strings.Split(ctx.String("assignees"), ","),
|
||||||
}
|
}
|
||||||
var err error
|
|
||||||
|
|
||||||
date := ctx.String("deadline")
|
date := ctx.String("deadline")
|
||||||
if date != "" {
|
if date != "" {
|
||||||
|
|
@ -208,9 +222,18 @@ func GetIssuePREditFlags(ctx *context.TeaContext) (*task.EditIssueOption, error)
|
||||||
val := ctx.String("title")
|
val := ctx.String("title")
|
||||||
opts.Title = &val
|
opts.Title = &val
|
||||||
}
|
}
|
||||||
if ctx.IsSet("description") {
|
body, err := resolveEditBody(
|
||||||
val := ctx.String("description")
|
ctx.String("description"),
|
||||||
opts.Body = &val
|
ctx.IsSet("description"),
|
||||||
|
ctx.String("description-file"),
|
||||||
|
ctx.IsSet("description-file"),
|
||||||
|
ctx.Reader,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if body != nil {
|
||||||
|
opts.Body = body
|
||||||
}
|
}
|
||||||
if ctx.IsSet("referenced-version") {
|
if ctx.IsSet("referenced-version") {
|
||||||
val := ctx.String("referenced-version")
|
val := ctx.String("referenced-version")
|
||||||
|
|
|
||||||
|
|
@ -5,13 +5,18 @@ package issues
|
||||||
|
|
||||||
import (
|
import (
|
||||||
stdctx "context"
|
stdctx "context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
|
||||||
|
gitea "gitea.dev/sdk"
|
||||||
|
"github.com/urfave/cli/v3"
|
||||||
|
|
||||||
"gitea.dev/tea/cmd/flags"
|
"gitea.dev/tea/cmd/flags"
|
||||||
"gitea.dev/tea/modules/context"
|
"gitea.dev/tea/modules/context"
|
||||||
"gitea.dev/tea/modules/interact"
|
"gitea.dev/tea/modules/interact"
|
||||||
|
"gitea.dev/tea/modules/print"
|
||||||
"gitea.dev/tea/modules/task"
|
"gitea.dev/tea/modules/task"
|
||||||
|
|
||||||
"github.com/urfave/cli/v3"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// CmdIssuesCreate represents a sub command of issues to create issue
|
// CmdIssuesCreate represents a sub command of issues to create issue
|
||||||
|
|
@ -47,9 +52,44 @@ func runIssuesCreate(requestCtx stdctx.Context, cmd *cli.Command) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return task.CreateIssue(requestCtx, ctx.Login,
|
issue, err := task.CreateIssue(requestCtx, ctx.Login,
|
||||||
ctx.Owner,
|
ctx.Owner,
|
||||||
ctx.Repo,
|
ctx.Repo,
|
||||||
*opts,
|
*opts,
|
||||||
)
|
)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if ctx.IsSet("output") {
|
||||||
|
switch ctx.String("output") {
|
||||||
|
case "json":
|
||||||
|
return writeCreatedIssueAsJSON(ctx.Writer, issue)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
print.IssueDetails(issue, nil)
|
||||||
|
|
||||||
|
fmt.Println(issue.HTMLURL)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// createdIssueJSON is the machine-readable representation of a freshly
|
||||||
|
// created issue, mirroring the create-PR equivalent in cmd/pulls/create.go
|
||||||
|
// (createdPullJSON).
|
||||||
|
type createdIssueJSON struct {
|
||||||
|
Index int64 `json:"index"`
|
||||||
|
Title string `json:"title"`
|
||||||
|
URL string `json:"url"`
|
||||||
|
State gitea.StateType `json:"state"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeCreatedIssueAsJSON(w io.Writer, issue *gitea.Issue) error {
|
||||||
|
return json.NewEncoder(w).Encode(createdIssueJSON{
|
||||||
|
Index: issue.Index,
|
||||||
|
Title: issue.Title,
|
||||||
|
URL: issue.HTMLURL,
|
||||||
|
State: issue.State,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
41
cmd/issues/create_test.go
Normal file
41
cmd/issues/create_test.go
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package issues
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
gitea "gitea.dev/sdk"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestWriteCreatedIssueAsJSON(t *testing.T) {
|
||||||
|
issue := &gitea.Issue{
|
||||||
|
Index: 42,
|
||||||
|
Title: "test title",
|
||||||
|
HTMLURL: "https://gitea.example.com/owner/repo/issues/42",
|
||||||
|
State: gitea.StateOpen,
|
||||||
|
}
|
||||||
|
|
||||||
|
var buf bytes.Buffer
|
||||||
|
require.NoError(t, writeCreatedIssueAsJSON(&buf, issue))
|
||||||
|
|
||||||
|
var got map[string]any
|
||||||
|
require.NoError(t, json.Unmarshal(buf.Bytes(), &got))
|
||||||
|
|
||||||
|
assert.Equal(t, float64(42), got["index"])
|
||||||
|
assert.Equal(t, "test title", got["title"])
|
||||||
|
assert.Equal(t, "https://gitea.example.com/owner/repo/issues/42", got["url"])
|
||||||
|
assert.Equal(t, "open", got["state"])
|
||||||
|
|
||||||
|
// exactly the lean field set, nothing extra
|
||||||
|
assert.Len(t, got, 4)
|
||||||
|
|
||||||
|
// machine-readable output must not contain terminal escape sequences
|
||||||
|
assert.NotContains(t, buf.String(), "\x1b")
|
||||||
|
}
|
||||||
|
|
@ -31,6 +31,7 @@ var CmdLogin = cli.Command{
|
||||||
&login.CmdLoginSetDefault,
|
&login.CmdLoginSetDefault,
|
||||||
&login.CmdLoginHelper,
|
&login.CmdLoginHelper,
|
||||||
&login.CmdLoginOAuthRefresh,
|
&login.CmdLoginOAuthRefresh,
|
||||||
|
&login.CmdLoginStatus,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
59
cmd/login/status.go
Normal file
59
cmd/login/status.go
Normal file
|
|
@ -0,0 +1,59 @@
|
||||||
|
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package login
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"gitea.dev/tea/cmd/flags"
|
||||||
|
"gitea.dev/tea/modules/config"
|
||||||
|
"gitea.dev/tea/modules/print"
|
||||||
|
"gitea.dev/tea/modules/task"
|
||||||
|
|
||||||
|
"github.com/urfave/cli/v3"
|
||||||
|
)
|
||||||
|
|
||||||
|
// CmdLoginStatus represents a command to show authentication status for logins.
|
||||||
|
var CmdLoginStatus = cli.Command{
|
||||||
|
Name: "status",
|
||||||
|
Usage: "Show authentication status for Gitea logins",
|
||||||
|
Description: `Verify the stored token for one or all Gitea logins and report its validity.`,
|
||||||
|
ArgsUsage: "[<login name>]",
|
||||||
|
Action: RunLoginStatus,
|
||||||
|
Flags: []cli.Flag{&flags.OutputFlag},
|
||||||
|
}
|
||||||
|
|
||||||
|
// RunLoginStatus verifies one login, or every configured login when no name is
|
||||||
|
// provided, and prints a short authentication report.
|
||||||
|
func RunLoginStatus(requestCtx context.Context, cmd *cli.Command) error {
|
||||||
|
var logins []config.Login
|
||||||
|
|
||||||
|
switch cmd.Args().Len() {
|
||||||
|
case 0:
|
||||||
|
var err error
|
||||||
|
logins, err = config.GetLogins()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
case 1:
|
||||||
|
login, err := config.GetLoginByName(cmd.Args().First())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if login == nil {
|
||||||
|
return fmt.Errorf("login '%s' not found", cmd.Args().First())
|
||||||
|
}
|
||||||
|
logins = []config.Login{*login}
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("too many arguments")
|
||||||
|
}
|
||||||
|
|
||||||
|
statuses := make([]print.LoginStatus, 0, len(logins))
|
||||||
|
for i := range logins {
|
||||||
|
statuses = append(statuses, task.CheckLoginStatus(requestCtx, &logins[i]))
|
||||||
|
}
|
||||||
|
|
||||||
|
return print.LoginStatuses(statuses, cmd.String("output"))
|
||||||
|
}
|
||||||
|
|
@ -5,6 +5,9 @@ package pulls
|
||||||
|
|
||||||
import (
|
import (
|
||||||
stdctx "context"
|
stdctx "context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
|
||||||
gitea "gitea.dev/sdk"
|
gitea "gitea.dev/sdk"
|
||||||
"github.com/urfave/cli/v3"
|
"github.com/urfave/cli/v3"
|
||||||
|
|
@ -12,6 +15,7 @@ import (
|
||||||
"gitea.dev/tea/cmd/flags"
|
"gitea.dev/tea/cmd/flags"
|
||||||
"gitea.dev/tea/modules/context"
|
"gitea.dev/tea/modules/context"
|
||||||
"gitea.dev/tea/modules/interact"
|
"gitea.dev/tea/modules/interact"
|
||||||
|
"gitea.dev/tea/modules/print"
|
||||||
"gitea.dev/tea/modules/task"
|
"gitea.dev/tea/modules/task"
|
||||||
"gitea.dev/tea/modules/utils"
|
"gitea.dev/tea/modules/utils"
|
||||||
)
|
)
|
||||||
|
|
@ -80,6 +84,12 @@ func runPullsCreate(requestCtx stdctx.Context, cmd *cli.Command) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// agit flow creates the PR via git push and returns no PR object, so
|
||||||
|
// --output cannot be honored there; fail fast before any API calls
|
||||||
|
if ctx.Bool("agit") && ctx.IsSet("output") {
|
||||||
|
return fmt.Errorf("--output cannot be combined with --agit: the PR is created via git push, so no pull request object is available to print")
|
||||||
|
}
|
||||||
|
|
||||||
// else use args to create PR
|
// else use args to create PR
|
||||||
opts, err := flags.GetIssuePRCreateFlags(requestCtx, ctx)
|
opts, err := flags.GetIssuePRCreateFlags(requestCtx, ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -108,7 +118,7 @@ func runPullsCreate(requestCtx stdctx.Context, cmd *cli.Command) error {
|
||||||
allowMaintainerEdits = gitea.OptionalBool(ctx.Bool("allow-maintainer-edits"))
|
allowMaintainerEdits = gitea.OptionalBool(ctx.Bool("allow-maintainer-edits"))
|
||||||
}
|
}
|
||||||
|
|
||||||
return task.CreatePull(
|
pr, err := task.CreatePull(
|
||||||
requestCtx,
|
requestCtx,
|
||||||
ctx,
|
ctx,
|
||||||
ctx.String("base"),
|
ctx.String("base"),
|
||||||
|
|
@ -116,4 +126,41 @@ func runPullsCreate(requestCtx stdctx.Context, cmd *cli.Command) error {
|
||||||
allowMaintainerEdits,
|
allowMaintainerEdits,
|
||||||
opts,
|
opts,
|
||||||
)
|
)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if ctx.IsSet("output") {
|
||||||
|
switch ctx.String("output") {
|
||||||
|
case "json":
|
||||||
|
return writeCreatedPullAsJSON(ctx.Writer, pr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
print.PullDetails(pr, nil, nil)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// createdPullJSON is the machine-readable representation of a freshly
|
||||||
|
// created pull request. A new PR has no reviews, comments or CI yet, so
|
||||||
|
// this is intentionally leaner than the detail view's pullData (cmd/pulls.go).
|
||||||
|
type createdPullJSON struct {
|
||||||
|
Index int64 `json:"index"`
|
||||||
|
Title string `json:"title"`
|
||||||
|
URL string `json:"url"`
|
||||||
|
State gitea.StateType `json:"state"`
|
||||||
|
Base string `json:"base"`
|
||||||
|
Head string `json:"head"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeCreatedPullAsJSON(w io.Writer, pr *gitea.PullRequest) error {
|
||||||
|
return json.NewEncoder(w).Encode(createdPullJSON{
|
||||||
|
Index: pr.Index,
|
||||||
|
Title: pr.Title,
|
||||||
|
URL: pr.HTMLURL,
|
||||||
|
State: pr.State,
|
||||||
|
Base: pr.Base.Ref,
|
||||||
|
Head: pr.Head.Ref,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
48
cmd/pulls/create_app_test.go
Normal file
48
cmd/pulls/create_app_test.go
Normal file
|
|
@ -0,0 +1,48 @@
|
||||||
|
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package pulls_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"gitea.dev/tea/cmd"
|
||||||
|
"gitea.dev/tea/modules/config"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestPullsCreateAgitOutputRejected verifies that --output (parsed via the
|
||||||
|
// urfave/cli v3 ancestor-flag cascade, since create itself does not declare
|
||||||
|
// it) is rejected for the agit flow before any API call or git push happens.
|
||||||
|
func TestPullsCreateAgitOutputRejected(t *testing.T) {
|
||||||
|
config.SetConfigForTesting(config.LocalConfig{
|
||||||
|
Logins: []config.Login{{
|
||||||
|
Name: "testLogin",
|
||||||
|
URL: "https://gitea.example.com",
|
||||||
|
Token: "test-token",
|
||||||
|
User: "testUser",
|
||||||
|
Default: true,
|
||||||
|
}},
|
||||||
|
})
|
||||||
|
t.Cleanup(func() {
|
||||||
|
config.SetConfigForTesting(config.LocalConfig{})
|
||||||
|
})
|
||||||
|
|
||||||
|
app := cmd.App()
|
||||||
|
args := []string{
|
||||||
|
"tea", "pulls", "create",
|
||||||
|
"--agit",
|
||||||
|
"--output", "json",
|
||||||
|
"--head", "topic-branch",
|
||||||
|
"--title", "test",
|
||||||
|
"--login", "testLogin",
|
||||||
|
"--repo", "user/repo",
|
||||||
|
}
|
||||||
|
|
||||||
|
err := app.Run(context.Background(), args)
|
||||||
|
require.Error(t, err)
|
||||||
|
assert.Contains(t, err.Error(), "--output cannot be combined with --agit")
|
||||||
|
}
|
||||||
45
cmd/pulls/create_test.go
Normal file
45
cmd/pulls/create_test.go
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package pulls
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
gitea "gitea.dev/sdk"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestWriteCreatedPullAsJSON(t *testing.T) {
|
||||||
|
pr := &gitea.PullRequest{
|
||||||
|
Index: 33,
|
||||||
|
Title: "test title",
|
||||||
|
HTMLURL: "https://gitea.example.com/owner/repo/pulls/33",
|
||||||
|
State: gitea.StateOpen,
|
||||||
|
Base: &gitea.PRBranchInfo{Ref: "main"},
|
||||||
|
Head: &gitea.PRBranchInfo{Ref: "feature"},
|
||||||
|
}
|
||||||
|
|
||||||
|
var buf bytes.Buffer
|
||||||
|
require.NoError(t, writeCreatedPullAsJSON(&buf, pr))
|
||||||
|
|
||||||
|
var got map[string]any
|
||||||
|
require.NoError(t, json.Unmarshal(buf.Bytes(), &got))
|
||||||
|
|
||||||
|
assert.Equal(t, float64(33), got["index"])
|
||||||
|
assert.Equal(t, "test title", got["title"])
|
||||||
|
assert.Equal(t, "https://gitea.example.com/owner/repo/pulls/33", got["url"])
|
||||||
|
assert.Equal(t, "open", got["state"])
|
||||||
|
assert.Equal(t, "main", got["base"])
|
||||||
|
assert.Equal(t, "feature", got["head"])
|
||||||
|
|
||||||
|
// exactly the lean field set, nothing extra
|
||||||
|
assert.Len(t, got, 6)
|
||||||
|
|
||||||
|
// machine-readable output must not contain terminal escape sequences
|
||||||
|
assert.NotContains(t, buf.String(), "\x1b")
|
||||||
|
}
|
||||||
14
docs/CLI.md
14
docs/CLI.md
|
|
@ -109,6 +109,12 @@ Return the stored token for a URL (git credential protocol)
|
||||||
|
|
||||||
Refresh an OAuth token
|
Refresh an OAuth token
|
||||||
|
|
||||||
|
### status
|
||||||
|
|
||||||
|
Show authentication status for Gitea logins
|
||||||
|
|
||||||
|
**--output, -o**="": Output format. (simple, table, csv, tsv, yaml, json)
|
||||||
|
|
||||||
## logout
|
## logout
|
||||||
|
|
||||||
Log out from a Gitea server
|
Log out from a Gitea server
|
||||||
|
|
@ -221,6 +227,8 @@ Create an issue on repository
|
||||||
|
|
||||||
**--description, -d**="":
|
**--description, -d**="":
|
||||||
|
|
||||||
|
**--description-file**="": Read description from file ('-' for stdin)
|
||||||
|
|
||||||
**--labels, -L**="": Comma-separated list of labels to assign
|
**--labels, -L**="": Comma-separated list of labels to assign
|
||||||
|
|
||||||
**--login, -l**="": Use a different Gitea Login. Optional
|
**--login, -l**="": Use a different Gitea Login. Optional
|
||||||
|
|
@ -247,6 +255,8 @@ Edit one or more issues
|
||||||
|
|
||||||
**--description, -d**="":
|
**--description, -d**="":
|
||||||
|
|
||||||
|
**--description-file**="": Read description from file ('-' for stdin)
|
||||||
|
|
||||||
**--login, -l**="": Use a different Gitea Login. Optional
|
**--login, -l**="": Use a different Gitea Login. Optional
|
||||||
|
|
||||||
**--milestone, -m**="": Milestone to assign
|
**--milestone, -m**="": Milestone to assign
|
||||||
|
|
@ -379,6 +389,8 @@ Create a pull-request
|
||||||
|
|
||||||
**--description, -d**="":
|
**--description, -d**="":
|
||||||
|
|
||||||
|
**--description-file**="": Read description from file ('-' for stdin)
|
||||||
|
|
||||||
**--draft**: Create as a draft (prepends "WIP: " to the title; Gitea treats WIP-prefixed PRs as drafts)
|
**--draft**: Create as a draft (prepends "WIP: " to the title; Gitea treats WIP-prefixed PRs as drafts)
|
||||||
|
|
||||||
**--head**="": Branch name of the PR source (default is current one). To specify a different head repo, use <user>:<branch>
|
**--head**="": Branch name of the PR source (default is current one). To specify a different head repo, use <user>:<branch>
|
||||||
|
|
@ -437,6 +449,8 @@ Edit one or more pull requests
|
||||||
|
|
||||||
**--description, -d**="":
|
**--description, -d**="":
|
||||||
|
|
||||||
|
**--description-file**="": Read description from file ('-' for stdin)
|
||||||
|
|
||||||
**--draft**: Mark as draft by prepending "WIP: " to the title (idempotent)
|
**--draft**: Mark as draft by prepending "WIP: " to the title (idempotent)
|
||||||
|
|
||||||
**--login, -l**="": Use a different Gitea Login. Optional
|
**--login, -l**="": Use a different Gitea Login. Optional
|
||||||
|
|
|
||||||
14
go.mod
14
go.mod
|
|
@ -1,6 +1,8 @@
|
||||||
module gitea.dev/tea
|
module gitea.dev/tea
|
||||||
|
|
||||||
go 1.26
|
go 1.26.0
|
||||||
|
|
||||||
|
toolchain go1.26.6
|
||||||
|
|
||||||
require (
|
require (
|
||||||
charm.land/glamour/v2 v2.0.1
|
charm.land/glamour/v2 v2.0.1
|
||||||
|
|
@ -12,14 +14,14 @@ require (
|
||||||
github.com/adrg/xdg v0.5.3
|
github.com/adrg/xdg v0.5.3
|
||||||
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
|
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
|
||||||
github.com/enescakir/emoji v1.0.0
|
github.com/enescakir/emoji v1.0.0
|
||||||
github.com/go-authgate/sdk-go v0.14.0
|
github.com/go-signet/sdk-go v1.1.0
|
||||||
github.com/muesli/termenv v0.16.0
|
github.com/muesli/termenv v0.16.0
|
||||||
github.com/olekukonko/tablewriter v1.1.4
|
github.com/olekukonko/tablewriter v1.1.4
|
||||||
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
|
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
|
||||||
github.com/stretchr/testify v1.11.1
|
github.com/stretchr/testify v1.11.1
|
||||||
github.com/urfave/cli-docs/v3 v3.1.0
|
github.com/urfave/cli-docs/v3 v3.1.0
|
||||||
github.com/urfave/cli/v3 v3.10.1
|
github.com/urfave/cli/v3 v3.10.1
|
||||||
golang.org/x/crypto v0.54.0
|
golang.org/x/crypto v0.56.0
|
||||||
golang.org/x/oauth2 v0.36.0
|
golang.org/x/oauth2 v0.36.0
|
||||||
golang.org/x/sys v0.47.0
|
golang.org/x/sys v0.47.0
|
||||||
golang.org/x/term v0.45.0
|
golang.org/x/term v0.45.0
|
||||||
|
|
@ -76,10 +78,10 @@ require (
|
||||||
github.com/yuin/goldmark-emoji v1.0.6 // indirect
|
github.com/yuin/goldmark-emoji v1.0.6 // indirect
|
||||||
github.com/zalando/go-keyring v0.2.8 // indirect
|
github.com/zalando/go-keyring v0.2.8 // indirect
|
||||||
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f // indirect
|
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f // indirect
|
||||||
golang.org/x/net v0.56.0 // indirect
|
golang.org/x/net v0.57.0 // indirect
|
||||||
golang.org/x/sync v0.22.0 // indirect
|
golang.org/x/sync v0.22.0 // indirect
|
||||||
golang.org/x/text v0.40.0 // indirect
|
golang.org/x/text v0.41.0 // indirect
|
||||||
golang.org/x/tools v0.47.0 // indirect
|
golang.org/x/tools v0.48.0 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
retract v1.3.3 // accidental release, tag deleted
|
retract v1.3.3 // accidental release, tag deleted
|
||||||
|
|
|
||||||
24
go.sum
24
go.sum
|
|
@ -89,8 +89,8 @@ github.com/enescakir/emoji v1.0.0 h1:W+HsNql8swfCQFtioDGDHCHri8nudlK1n5p2rHCJoog
|
||||||
github.com/enescakir/emoji v1.0.0/go.mod h1:Bt1EKuLnKDTYpLALApstIkAjdDrS/8IAgTkKp+WKFD0=
|
github.com/enescakir/emoji v1.0.0/go.mod h1:Bt1EKuLnKDTYpLALApstIkAjdDrS/8IAgTkKp+WKFD0=
|
||||||
github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w=
|
github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w=
|
||||||
github.com/fatih/color v1.19.0/go.mod h1:zNk67I0ZUT1bEGsSGyCZYZNrHuTkJJB+r6Q9VuMi0LE=
|
github.com/fatih/color v1.19.0/go.mod h1:zNk67I0ZUT1bEGsSGyCZYZNrHuTkJJB+r6Q9VuMi0LE=
|
||||||
github.com/go-authgate/sdk-go v0.14.0 h1:s1i/UCX2Edf3A1pKDW6oXv+oACQfTroxiGY52eqKx+4=
|
github.com/go-signet/sdk-go v1.1.0 h1:wHKg9P+goQ14A1Q0gtC6m3mCzRFWwL1peAGz/zhmAZQ=
|
||||||
github.com/go-authgate/sdk-go v0.14.0/go.mod h1:sa0ige5wtayj2WcnXlxa8wGuyi5z/c/chc0mXPJTl/Q=
|
github.com/go-signet/sdk-go v1.1.0/go.mod h1:bmi7nDAu7o6MQnUE3K7ZNEKU4xqh3u/SMbPC5GanOR8=
|
||||||
github.com/goccy/go-json v0.10.6 h1:p8HrPJzOakx/mn/bQtjgNjdTcN+/S6FcG2CTtQOrHVU=
|
github.com/goccy/go-json v0.10.6 h1:p8HrPJzOakx/mn/bQtjgNjdTcN+/S6FcG2CTtQOrHVU=
|
||||||
github.com/goccy/go-json v0.10.6/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
|
github.com/goccy/go-json v0.10.6/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
|
||||||
github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
|
github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
|
||||||
|
|
@ -162,19 +162,19 @@ github.com/zalando/go-keyring v0.2.8/go.mod h1:tsMo+VpRq5NGyKfxoBVjCuMrG47yj8cma
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
|
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
|
||||||
golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw=
|
golang.org/x/crypto v0.56.0 h1:GUh5Ii4J5jtcseSMiRqr1jXCNHoxjeV9Fmekc2oLy6Y=
|
||||||
golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk=
|
golang.org/x/crypto v0.56.0/go.mod h1:OMW5y6CY9l38uPLmxU6l6pwcXp1obtLo3e6gT7gQR2I=
|
||||||
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM=
|
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM=
|
||||||
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80=
|
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80=
|
||||||
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
|
golang.org/x/mod v0.38.0 h1:MECBjubtXD7yj4HrhIUcywNaGeNVUdfVnxmPajOk4yk=
|
||||||
golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0=
|
golang.org/x/mod v0.38.0/go.mod h1:V6Xz0pq8TQ3dGqVQ1FVHuelZpAL0uNhSkk9ogYP3c40=
|
||||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||||
golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
|
golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE=
|
||||||
golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
|
golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU=
|
||||||
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
|
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
|
||||||
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
|
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
|
|
@ -191,13 +191,13 @@ golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0=
|
||||||
golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w=
|
golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w=
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs=
|
golang.org/x/text v0.41.0 h1:vz/seA0lnX87Othu2f/0L24RcgrXD9/YFTSuGjj3rH8=
|
||||||
golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=
|
golang.org/x/text v0.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M=
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
|
golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
|
||||||
golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q=
|
golang.org/x/tools v0.48.0 h1:3+hClM1aLL5mjMKm5ovokw9epgRXPuu2tILgismM6RE=
|
||||||
golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA=
|
golang.org/x/tools v0.48.0/go.mod h1:08xX0orndb/F7jJxGDicx061tyd5pcMto75YMAXr6lk=
|
||||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
|
|
|
||||||
|
|
@ -366,7 +366,9 @@ func startLocalServerAndOpenBrowser(authURL, expectedState string, opts *OAuthOp
|
||||||
var openBrowser = func(url string) error {
|
var openBrowser = func(url string) error {
|
||||||
fmt.Printf("Please authorize the application by visiting this URL in your browser:\n%s\n", url)
|
fmt.Printf("Please authorize the application by visiting this URL in your browser:\n%s\n", url)
|
||||||
|
|
||||||
return open.Run(url)
|
// Don't wait for the opener to exit, so a browser that holds the
|
||||||
|
// foreground can't block the wait for the callback.
|
||||||
|
return open.Start(url)
|
||||||
}
|
}
|
||||||
|
|
||||||
// createLoginFromToken creates a login entry using the obtained access token
|
// createLoginFromToken creates a login entry using the obtained access token
|
||||||
|
|
|
||||||
|
|
@ -6,11 +6,16 @@ package auth
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"runtime"
|
||||||
"sync"
|
"sync"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
@ -89,3 +94,36 @@ func TestPerformBrowserOAuthFlow_RedirectURIMatchesAcrossAuthorizeAndExchange(t
|
||||||
assert.Equal(t, authorizeRedirectURI, exchangeRedirectURI,
|
assert.Equal(t, authorizeRedirectURI, exchangeRedirectURI,
|
||||||
"redirect_uri must match between authorize and token exchange (RFC 6749 §4.1.3)")
|
"redirect_uri must match between authorize and token exchange (RFC 6749 §4.1.3)")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Regression test for the browser opener hang: xdg-open does not exit until
|
||||||
|
// the browser it launched does, and the callback is only consumed after
|
||||||
|
// openBrowser returns. Waiting on the opener hangs the CLI even though the
|
||||||
|
// user authenticated successfully.
|
||||||
|
func TestOpenBrowser_DoesNotWaitForOpener(t *testing.T) {
|
||||||
|
if runtime.GOOS == "windows" || runtime.GOOS == "darwin" {
|
||||||
|
t.Skip("xdg-open is not the opener on this platform")
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
fakeOpenerSleepTime = 10 * time.Second
|
||||||
|
openBrowserTimeout = 2 * time.Second
|
||||||
|
)
|
||||||
|
|
||||||
|
// A stand-in xdg-open that holds the foreground the way a browser it had
|
||||||
|
// to launch would.
|
||||||
|
dir := t.TempDir()
|
||||||
|
opener := filepath.Join(dir, "xdg-open")
|
||||||
|
script := fmt.Sprintf("#!/bin/sh\nexec sleep %d\n", int(fakeOpenerSleepTime.Seconds()))
|
||||||
|
require.NoError(t, os.WriteFile(opener, []byte(script), 0o755))
|
||||||
|
t.Setenv("PATH", dir+string(os.PathListSeparator)+os.Getenv("PATH"))
|
||||||
|
|
||||||
|
done := make(chan error, 1)
|
||||||
|
go func() { done <- openBrowser("http://127.0.0.1:1/") }()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case err := <-done:
|
||||||
|
require.NoError(t, err)
|
||||||
|
case <-time.After(openBrowserTimeout):
|
||||||
|
t.Fatal("openBrowser blocked on the opener; the callback would never be consumed")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/adrg/xdg"
|
"github.com/adrg/xdg"
|
||||||
"github.com/go-authgate/sdk-go/credstore"
|
"github.com/go-signet/sdk-go/credstore"
|
||||||
"golang.org/x/oauth2"
|
"golang.org/x/oauth2"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -446,6 +446,14 @@ func (l *Login) Client(options ...gitea.ClientOption) *gitea.Client {
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return l.ClientWithoutRefresh(options...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClientWithoutRefresh returns a client to operate the Gitea API without
|
||||||
|
// attempting an automatic OAuth token refresh. Commands that need to handle
|
||||||
|
// token refresh errors themselves (such as 'tea login status') should use this
|
||||||
|
// instead of Client, which prints to stderr and exits on refresh failure.
|
||||||
|
func (l *Login) ClientWithoutRefresh(options ...gitea.ClientOption) *gitea.Client {
|
||||||
// Configure transport-level timeouts so a stalled or unresponsive server
|
// Configure transport-level timeouts so a stalled or unresponsive server
|
||||||
// fails fast instead of hanging forever. These bound connection setup and
|
// fails fast instead of hanging forever. These bound connection setup and
|
||||||
// time-to-first-response-byte only, so slow-but-progressing transfers (e.g.
|
// time-to-first-response-byte only, so slow-but-progressing transfers (e.g.
|
||||||
|
|
|
||||||
|
|
@ -5,11 +5,13 @@ package interact
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
gitea "gitea.dev/sdk"
|
gitea "gitea.dev/sdk"
|
||||||
|
|
||||||
"gitea.dev/tea/modules/config"
|
"gitea.dev/tea/modules/config"
|
||||||
|
"gitea.dev/tea/modules/print"
|
||||||
"gitea.dev/tea/modules/task"
|
"gitea.dev/tea/modules/task"
|
||||||
"gitea.dev/tea/modules/theme"
|
"gitea.dev/tea/modules/theme"
|
||||||
|
|
||||||
|
|
@ -34,7 +36,16 @@ func CreateIssue(ctx context.Context, login *config.Login, owner, repo string) e
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return task.CreateIssue(ctx, login, owner, repo, opts)
|
issue, err := task.CreateIssue(ctx, login, owner, repo, opts)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
print.IssueDetails(issue, nil)
|
||||||
|
|
||||||
|
fmt.Println(issue.HTMLURL)
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func promptIssueProperties(ctx context.Context, login *config.Login, owner, repo string, o *gitea.CreateIssueOption) error {
|
func promptIssueProperties(ctx context.Context, login *config.Login, owner, repo string, o *gitea.CreateIssueOption) error {
|
||||||
|
|
|
||||||
|
|
@ -200,25 +200,9 @@ func CreateLogin(ctx context.Context) error {
|
||||||
}
|
}
|
||||||
printTitleAndContent("Selected ssh-key:", sshKey)
|
printTitleAndContent("Selected ssh-key:", sshKey)
|
||||||
|
|
||||||
// ssh certificate
|
sshKey, sshCertPrincipal, sshKeyFingerprint, sshAgent, err = parseSSHPubkeySelection(sshKey)
|
||||||
if strings.Contains(sshKey, "principals") {
|
if err != nil {
|
||||||
sshCertPrincipal = regexp.MustCompile(`.*?principals: (.*?)[,|\s]`).FindStringSubmatch(sshKey)[1]
|
return err
|
||||||
if strings.Contains(sshKey, "(ssh-agent)") {
|
|
||||||
sshAgent = true
|
|
||||||
sshKey = ""
|
|
||||||
} else {
|
|
||||||
sshKey = regexp.MustCompile(`\((.*?)\)$`).FindStringSubmatch(sshKey)[1]
|
|
||||||
sshKey = strings.TrimSuffix(sshKey, "-cert.pub")
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
sshKeyFingerprint = regexp.MustCompile(`(SHA256:.*?)\s`).FindStringSubmatch(sshKey)[1]
|
|
||||||
if strings.Contains(sshKey, "(ssh-agent)") {
|
|
||||||
sshAgent = true
|
|
||||||
sshKey = ""
|
|
||||||
} else {
|
|
||||||
sshKey = regexp.MustCompile(`\((.*?)\)$`).FindStringSubmatch(sshKey)[1]
|
|
||||||
sshKey = strings.TrimSuffix(sshKey, ".pub")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -274,6 +258,40 @@ func CreateLogin(ctx context.Context) error {
|
||||||
return task.CreateLogin(ctx, name, token, user, passwd, otp, scopes, sshKey, giteaURL, sshCertPrincipal, sshKeyFingerprint, insecure, sshAgent, versionCheck, helper)
|
return task.CreateLogin(ctx, name, token, user, passwd, otp, scopes, sshKey, giteaURL, sshCertPrincipal, sshKeyFingerprint, insecure, sshAgent, versionCheck, helper)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func parseSSHPubkeySelection(display string) (sshKey, sshCertPrincipal, sshKeyFingerprint string, sshAgent bool, err error) {
|
||||||
|
if strings.Contains(display, "principals") {
|
||||||
|
if sshCertPrincipal, err = regexpSubmatch(regexp.MustCompile(`.*?principals: (.*?)[,|\s]`), display); err != nil {
|
||||||
|
return "", "", "", false, fmt.Errorf("failed to parse SSH certificate principal from %q: %w", display, err)
|
||||||
|
}
|
||||||
|
if strings.HasSuffix(display, "(ssh-agent)") {
|
||||||
|
return "", sshCertPrincipal, "", true, nil
|
||||||
|
}
|
||||||
|
if sshKey, err = regexpSubmatch(regexp.MustCompile(`\((.*?)\)$`), display); err != nil {
|
||||||
|
return "", "", "", false, fmt.Errorf("failed to parse SSH certificate path from %q: %w", display, err)
|
||||||
|
}
|
||||||
|
return strings.TrimSuffix(sshKey, "-cert.pub"), sshCertPrincipal, "", false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if sshKeyFingerprint, err = regexpSubmatch(regexp.MustCompile(`(SHA256:.*?)\s`), display); err != nil {
|
||||||
|
return "", "", "", false, fmt.Errorf("failed to parse SSH key fingerprint from %q: %w", display, err)
|
||||||
|
}
|
||||||
|
if strings.HasSuffix(display, "(ssh-agent)") {
|
||||||
|
return "", "", sshKeyFingerprint, true, nil
|
||||||
|
}
|
||||||
|
if sshKey, err = regexpSubmatch(regexp.MustCompile(`\((.*?)\)$`), display); err != nil {
|
||||||
|
return "", "", "", false, fmt.Errorf("failed to parse SSH key path from %q: %w", display, err)
|
||||||
|
}
|
||||||
|
return strings.TrimSuffix(sshKey, ".pub"), "", sshKeyFingerprint, false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func regexpSubmatch(re *regexp.Regexp, s string) (string, error) {
|
||||||
|
match := re.FindStringSubmatch(s)
|
||||||
|
if len(match) < 2 {
|
||||||
|
return "", fmt.Errorf("no match")
|
||||||
|
}
|
||||||
|
return match[1], nil
|
||||||
|
}
|
||||||
|
|
||||||
var tokenScopeOpts = []string{
|
var tokenScopeOpts = []string{
|
||||||
string(gitea.AccessTokenScopeAll),
|
string(gitea.AccessTokenScopeAll),
|
||||||
string(gitea.AccessTokenScopeRepo),
|
string(gitea.AccessTokenScopeRepo),
|
||||||
|
|
|
||||||
69
modules/interact/login_test.go
Normal file
69
modules/interact/login_test.go
Normal file
|
|
@ -0,0 +1,69 @@
|
||||||
|
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package interact
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestParseSSHPubkeySelection(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
display string
|
||||||
|
wantSSHKey string
|
||||||
|
wantCertPrincipal string
|
||||||
|
wantKeyFingerprint string
|
||||||
|
wantSSHAgent bool
|
||||||
|
wantErr bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "local ed25519 key",
|
||||||
|
display: "SHA256:abc ssh-ed25519 comment (/home/user/.ssh/id_ed25519.pub)",
|
||||||
|
wantSSHKey: "/home/user/.ssh/id_ed25519",
|
||||||
|
wantKeyFingerprint: "SHA256:abc",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "agent ed25519 key",
|
||||||
|
display: "SHA256:abc ssh-ed25519 comment (ssh-agent)",
|
||||||
|
wantKeyFingerprint: "SHA256:abc",
|
||||||
|
wantSSHAgent: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "local certificate",
|
||||||
|
display: "SHA256:abc ssh-ed25519-cert-v01@openssh.com comment - principals: user1,user2 (/home/user/.ssh/id_ed25519-cert.pub)",
|
||||||
|
wantSSHKey: "/home/user/.ssh/id_ed25519",
|
||||||
|
wantCertPrincipal: "user1",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "agent certificate",
|
||||||
|
display: "SHA256:abc ssh-ed25519-cert-v01@openssh.com comment - principals: user1 (ssh-agent)",
|
||||||
|
wantCertPrincipal: "user1",
|
||||||
|
wantSSHAgent: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "unexpected display",
|
||||||
|
display: "ssh-ed25519 comment",
|
||||||
|
wantErr: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
sshKey, certPrincipal, keyFingerprint, sshAgent, err := parseSSHPubkeySelection(tt.display)
|
||||||
|
if tt.wantErr {
|
||||||
|
require.Error(t, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
require.NoError(t, err)
|
||||||
|
assert.Equal(t, tt.wantSSHKey, sshKey)
|
||||||
|
assert.Equal(t, tt.wantCertPrincipal, certPrincipal)
|
||||||
|
assert.Equal(t, tt.wantKeyFingerprint, keyFingerprint)
|
||||||
|
assert.Equal(t, tt.wantSSHAgent, sshAgent)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -8,6 +8,7 @@ import (
|
||||||
|
|
||||||
gitea "gitea.dev/sdk"
|
gitea "gitea.dev/sdk"
|
||||||
"gitea.dev/tea/modules/context"
|
"gitea.dev/tea/modules/context"
|
||||||
|
"gitea.dev/tea/modules/print"
|
||||||
"gitea.dev/tea/modules/task"
|
"gitea.dev/tea/modules/task"
|
||||||
"gitea.dev/tea/modules/theme"
|
"gitea.dev/tea/modules/theme"
|
||||||
|
|
||||||
|
|
@ -134,11 +135,18 @@ func CreatePull(requestCtx stdctx.Context, ctx *context.TeaContext) (err error)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return task.CreatePull(
|
pr, err := task.CreatePull(
|
||||||
requestCtx,
|
requestCtx,
|
||||||
ctx,
|
ctx,
|
||||||
base,
|
base,
|
||||||
head,
|
head,
|
||||||
&allowMaintainerEdits,
|
&allowMaintainerEdits,
|
||||||
&opts)
|
&opts)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
print.PullDetails(pr, nil, nil)
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
||||||
145
modules/print/login_status.go
Normal file
145
modules/print/login_status.go
Normal file
|
|
@ -0,0 +1,145 @@
|
||||||
|
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package print
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// LoginStatus contains the authentication status of a single configured login.
|
||||||
|
type LoginStatus struct {
|
||||||
|
Name string
|
||||||
|
URL string
|
||||||
|
User string
|
||||||
|
Valid bool
|
||||||
|
AuthMethod string
|
||||||
|
TokenExpiry time.Time
|
||||||
|
Helper bool
|
||||||
|
Default bool
|
||||||
|
Error string
|
||||||
|
}
|
||||||
|
|
||||||
|
// LoginStatusFields are the available fields to print with LoginStatuses.
|
||||||
|
var LoginStatusFields = []string{
|
||||||
|
"name",
|
||||||
|
"url",
|
||||||
|
"user",
|
||||||
|
"valid",
|
||||||
|
"auth_method",
|
||||||
|
"token_expiry",
|
||||||
|
"helper",
|
||||||
|
"default",
|
||||||
|
}
|
||||||
|
|
||||||
|
// LoginStatuses prints authentication status for one or more logins.
|
||||||
|
func LoginStatuses(statuses []LoginStatus, output string) error {
|
||||||
|
if output != "" {
|
||||||
|
printables := make([]printable, len(statuses))
|
||||||
|
for i := range statuses {
|
||||||
|
printables[i] = statuses[i]
|
||||||
|
}
|
||||||
|
t := tableFromItems(LoginStatusFields, printables, isMachineReadable(output))
|
||||||
|
return t.print(output)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(statuses) == 0 {
|
||||||
|
fmt.Println("No logins configured.")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
for i, status := range statuses {
|
||||||
|
if i > 0 {
|
||||||
|
fmt.Println()
|
||||||
|
}
|
||||||
|
printLoginStatusReport(status)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func printLoginStatusReport(status LoginStatus) {
|
||||||
|
name := status.Name
|
||||||
|
if status.Default {
|
||||||
|
name += " (default)"
|
||||||
|
}
|
||||||
|
fmt.Println(name)
|
||||||
|
|
||||||
|
if status.Valid {
|
||||||
|
line := " ✔ Logged in to " + status.URL
|
||||||
|
if status.User != "" {
|
||||||
|
line += " as " + status.User
|
||||||
|
}
|
||||||
|
fmt.Println(line)
|
||||||
|
|
||||||
|
tokenLine := " ✔ Token is valid"
|
||||||
|
if status.AuthMethod != "" {
|
||||||
|
tokenLine += " (" + status.AuthMethod
|
||||||
|
if !status.TokenExpiry.IsZero() {
|
||||||
|
tokenLine += ", " + formatTokenExpiry(status.TokenExpiry)
|
||||||
|
}
|
||||||
|
tokenLine += ")"
|
||||||
|
}
|
||||||
|
fmt.Println(tokenLine)
|
||||||
|
} else {
|
||||||
|
message := status.Error
|
||||||
|
if message == "" {
|
||||||
|
message = "Login failed"
|
||||||
|
}
|
||||||
|
fmt.Println(" ✗ " + message)
|
||||||
|
}
|
||||||
|
|
||||||
|
if status.Helper {
|
||||||
|
fmt.Println(" ✔ Git credential helper configured")
|
||||||
|
} else {
|
||||||
|
fmt.Println(" ✗ Git credential helper not configured")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func formatExpiryDuration(t time.Time) string {
|
||||||
|
d := time.Until(t)
|
||||||
|
if d < 0 {
|
||||||
|
return "expired"
|
||||||
|
}
|
||||||
|
if d < time.Minute {
|
||||||
|
return "in less than a minute"
|
||||||
|
}
|
||||||
|
return "in " + strings.TrimSuffix(d.Truncate(time.Minute).String(), "0s")
|
||||||
|
}
|
||||||
|
|
||||||
|
func formatTokenExpiry(t time.Time) string {
|
||||||
|
if t.Before(time.Now()) {
|
||||||
|
return "expired"
|
||||||
|
}
|
||||||
|
return "expires " + formatExpiryDuration(t)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FormatField implements the printable interface for LoginStatus.
|
||||||
|
func (s LoginStatus) FormatField(field string, machineReadable bool) string {
|
||||||
|
switch field {
|
||||||
|
case "name":
|
||||||
|
return s.Name
|
||||||
|
case "url":
|
||||||
|
return s.URL
|
||||||
|
case "user":
|
||||||
|
return s.User
|
||||||
|
case "valid":
|
||||||
|
return formatBoolean(s.Valid, !machineReadable)
|
||||||
|
case "auth_method":
|
||||||
|
return s.AuthMethod
|
||||||
|
case "token_expiry":
|
||||||
|
if s.TokenExpiry.IsZero() {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if machineReadable {
|
||||||
|
return FormatTime(s.TokenExpiry, true)
|
||||||
|
}
|
||||||
|
return formatExpiryDuration(s.TokenExpiry)
|
||||||
|
case "helper":
|
||||||
|
return formatBoolean(s.Helper, !machineReadable)
|
||||||
|
case "default":
|
||||||
|
return formatBoolean(s.Default, !machineReadable)
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
38
modules/print/login_status_test.go
Normal file
38
modules/print/login_status_test.go
Normal file
|
|
@ -0,0 +1,38 @@
|
||||||
|
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package print
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestLoginStatusFormatField(t *testing.T) {
|
||||||
|
status := LoginStatus{
|
||||||
|
Name: "gitea",
|
||||||
|
URL: "https://gitea.com",
|
||||||
|
User: "alice",
|
||||||
|
Valid: true,
|
||||||
|
AuthMethod: "oauth",
|
||||||
|
TokenExpiry: time.Date(2026, 8, 27, 12, 0, 0, 0, time.UTC),
|
||||||
|
Helper: true,
|
||||||
|
Default: true,
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.Equal(t, "gitea", status.FormatField("name", false))
|
||||||
|
assert.Equal(t, "https://gitea.com", status.FormatField("url", false))
|
||||||
|
assert.Equal(t, "alice", status.FormatField("user", false))
|
||||||
|
assert.Equal(t, "true", status.FormatField("valid", true))
|
||||||
|
assert.Equal(t, "✔", status.FormatField("valid", false))
|
||||||
|
assert.Equal(t, "oauth", status.FormatField("auth_method", true))
|
||||||
|
assert.Equal(t, "2026-08-27T12:00:00Z", status.FormatField("token_expiry", true))
|
||||||
|
assert.Equal(t, "true", status.FormatField("helper", true))
|
||||||
|
assert.Equal(t, "✔", status.FormatField("default", false))
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFormatExpiryDurationExpired(t *testing.T) {
|
||||||
|
assert.Equal(t, "expired", formatExpiryDuration(time.Now().Add(-time.Hour)))
|
||||||
|
}
|
||||||
|
|
@ -10,24 +10,19 @@ import (
|
||||||
gitea "gitea.dev/sdk"
|
gitea "gitea.dev/sdk"
|
||||||
|
|
||||||
"gitea.dev/tea/modules/config"
|
"gitea.dev/tea/modules/config"
|
||||||
"gitea.dev/tea/modules/print"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// CreateIssue creates an issue in the given repo and prints the result
|
// CreateIssue creates an issue in the given repo and returns the created issue
|
||||||
func CreateIssue(requestCtx stdctx.Context, rlogin *config.Login, repoOwner, repoName string, opts gitea.CreateIssueOption) error {
|
func CreateIssue(requestCtx stdctx.Context, rlogin *config.Login, repoOwner, repoName string, opts gitea.CreateIssueOption) (*gitea.Issue, error) {
|
||||||
// title is required
|
// title is required
|
||||||
if len(opts.Title) == 0 {
|
if len(opts.Title) == 0 {
|
||||||
return fmt.Errorf("title is required")
|
return nil, fmt.Errorf("title is required")
|
||||||
}
|
}
|
||||||
|
|
||||||
issue, _, err := rlogin.Client().Issues.CreateIssue(requestCtx, repoOwner, repoName, opts)
|
issue, _, err := rlogin.Client().Issues.CreateIssue(requestCtx, repoOwner, repoName, opts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("could not create issue: %s", err)
|
return nil, fmt.Errorf("could not create issue: %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
print.IssueDetails(issue, nil)
|
return issue, nil
|
||||||
|
|
||||||
fmt.Println(issue.HTMLURL)
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,29 @@ func SetupHelper(login config.Login) (ok bool, err error) {
|
||||||
return true, nil
|
return true, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// HasGitCredentialHelper reports whether tea is registered as a git credential
|
||||||
|
// helper for the given login. It mirrors the global git config lookup used by
|
||||||
|
// SetupHelper.
|
||||||
|
func HasGitCredentialHelper(login config.Login) bool {
|
||||||
|
if login.URL == "" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
helperKey := fmt.Sprintf("credential.%s.helper", login.URL)
|
||||||
|
currentHelpers, err := exec.Command("git", "config", "--global", "--get-all", helperKey).Output()
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, line := range strings.Split(strings.ReplaceAll(string(currentHelpers), "\r", ""), "\n") {
|
||||||
|
if strings.HasSuffix(strings.TrimSpace(line), "login helper") {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
// CreateLogin create a login to be stored in config
|
// CreateLogin create a login to be stored in config
|
||||||
func CreateLogin(ctx stdctx.Context, name, token, user, passwd, otp, scopes, sshKey, giteaURL, sshCertPrincipal, sshKeyFingerprint string, insecure, sshAgent, versionCheck, addHelper bool) error {
|
func CreateLogin(ctx stdctx.Context, name, token, user, passwd, otp, scopes, sshKey, giteaURL, sshCertPrincipal, sshKeyFingerprint string, insecure, sshAgent, versionCheck, addHelper bool) error {
|
||||||
// checks ...
|
// checks ...
|
||||||
|
|
|
||||||
67
modules/task/login_status.go
Normal file
67
modules/task/login_status.go
Normal file
|
|
@ -0,0 +1,67 @@
|
||||||
|
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package task
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"gitea.dev/tea/modules/config"
|
||||||
|
"gitea.dev/tea/modules/print"
|
||||||
|
)
|
||||||
|
|
||||||
|
// CheckLoginStatus verifies the stored token for a login against the server and
|
||||||
|
// returns a printable status. Unlike config.Login.Client, refresh failures are
|
||||||
|
// captured in the returned status instead of terminating the process.
|
||||||
|
func CheckLoginStatus(ctx context.Context, login *config.Login) print.LoginStatus {
|
||||||
|
status := print.LoginStatus{
|
||||||
|
Name: login.Name,
|
||||||
|
URL: login.URL,
|
||||||
|
AuthMethod: loginAuthMethod(login),
|
||||||
|
TokenExpiry: loginTokenExpiry(login),
|
||||||
|
Helper: HasGitCredentialHelper(*login),
|
||||||
|
Default: login.Default,
|
||||||
|
}
|
||||||
|
|
||||||
|
if login.GetAccessToken() == "" {
|
||||||
|
status.Error = "Login failed: no access token configured"
|
||||||
|
return status
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := login.RefreshOAuthTokenIfNeeded(); err != nil {
|
||||||
|
status.Error = "Token refresh failed: " + strings.TrimPrefix(err.Error(), "failed to refresh token: ")
|
||||||
|
return status
|
||||||
|
}
|
||||||
|
|
||||||
|
// A successful refresh updates the token in the secure store, so re-read the
|
||||||
|
// expiry for the status line.
|
||||||
|
status.TokenExpiry = loginTokenExpiry(login)
|
||||||
|
|
||||||
|
user, _, err := login.ClientWithoutRefresh().Users.GetMyUserInfo(ctx)
|
||||||
|
if err != nil {
|
||||||
|
status.Error = fmt.Sprintf("Login failed: %s", err)
|
||||||
|
return status
|
||||||
|
}
|
||||||
|
|
||||||
|
status.Valid = true
|
||||||
|
status.User = user.UserName
|
||||||
|
return status
|
||||||
|
}
|
||||||
|
|
||||||
|
func loginAuthMethod(login *config.Login) string {
|
||||||
|
if login.IsOAuth() {
|
||||||
|
return config.AuthMethodOAuth
|
||||||
|
}
|
||||||
|
return "token"
|
||||||
|
}
|
||||||
|
|
||||||
|
func loginTokenExpiry(login *config.Login) time.Time {
|
||||||
|
expiry := login.GetTokenExpiry()
|
||||||
|
if expiry.Equal(time.Unix(0, 0)) {
|
||||||
|
return time.Time{}
|
||||||
|
}
|
||||||
|
return expiry
|
||||||
|
}
|
||||||
75
modules/task/login_status_test.go
Normal file
75
modules/task/login_status_test.go
Normal file
|
|
@ -0,0 +1,75 @@
|
||||||
|
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package task
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"gitea.dev/tea/modules/config"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestCheckLoginStatus(t *testing.T) {
|
||||||
|
// Keep helper detection isolated from the developer's real git config.
|
||||||
|
t.Setenv("GIT_CONFIG_GLOBAL", filepath.Join(t.TempDir(), ".gitconfig"))
|
||||||
|
|
||||||
|
t.Run("valid token", func(t *testing.T) {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
assert.Equal(t, "/api/v1/user", r.URL.Path)
|
||||||
|
assert.Equal(t, "token secret-token", r.Header.Get("Authorization"))
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
_, _ = w.Write([]byte(`{"id":1,"login":"alice"}`))
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
status := CheckLoginStatus(context.Background(), &config.Login{
|
||||||
|
Name: "test",
|
||||||
|
URL: server.URL,
|
||||||
|
Token: "secret-token",
|
||||||
|
VersionCheck: false,
|
||||||
|
})
|
||||||
|
|
||||||
|
assert.True(t, status.Valid)
|
||||||
|
assert.Empty(t, status.Error)
|
||||||
|
assert.Equal(t, "test", status.Name)
|
||||||
|
assert.Equal(t, server.URL, status.URL)
|
||||||
|
assert.Equal(t, "alice", status.User)
|
||||||
|
assert.Equal(t, "token", status.AuthMethod)
|
||||||
|
assert.False(t, status.Helper)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("invalid token", func(t *testing.T) {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(http.StatusUnauthorized)
|
||||||
|
_, _ = w.Write([]byte(`{"message":"token is invalid"}`))
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
status := CheckLoginStatus(context.Background(), &config.Login{
|
||||||
|
Name: "test",
|
||||||
|
URL: server.URL,
|
||||||
|
Token: "expired-token",
|
||||||
|
VersionCheck: false,
|
||||||
|
})
|
||||||
|
|
||||||
|
assert.False(t, status.Valid)
|
||||||
|
assert.Contains(t, status.Error, "token is invalid")
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("missing token", func(t *testing.T) {
|
||||||
|
status := CheckLoginStatus(context.Background(), &config.Login{
|
||||||
|
Name: "test",
|
||||||
|
URL: "https://gitea.example.com",
|
||||||
|
})
|
||||||
|
|
||||||
|
assert.False(t, status.Valid)
|
||||||
|
assert.Contains(t, status.Error, "no access token configured")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
@ -14,7 +14,6 @@ import (
|
||||||
"gitea.dev/tea/modules/config"
|
"gitea.dev/tea/modules/config"
|
||||||
"gitea.dev/tea/modules/context"
|
"gitea.dev/tea/modules/context"
|
||||||
local_git "gitea.dev/tea/modules/git"
|
local_git "gitea.dev/tea/modules/git"
|
||||||
"gitea.dev/tea/modules/print"
|
|
||||||
"gitea.dev/tea/modules/utils"
|
"gitea.dev/tea/modules/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -24,24 +23,26 @@ var (
|
||||||
consecutive = regexp.MustCompile(`[\s]{2,}`)
|
consecutive = regexp.MustCompile(`[\s]{2,}`)
|
||||||
)
|
)
|
||||||
|
|
||||||
// CreatePull creates a PR in the given repo and prints the result
|
// CreatePull creates a PR in the given repo and returns the created PR
|
||||||
func CreatePull(requestCtx stdctx.Context, ctx *context.TeaContext, base, head string, allowMaintainerEdits *bool, opts *gitea.CreateIssueOption) (err error) {
|
func CreatePull(requestCtx stdctx.Context, ctx *context.TeaContext, base, head string, allowMaintainerEdits *bool, opts *gitea.CreateIssueOption) (*gitea.PullRequest, error) {
|
||||||
|
var err error
|
||||||
|
|
||||||
// default is default branch
|
// default is default branch
|
||||||
if len(base) == 0 {
|
if len(base) == 0 {
|
||||||
base, err = GetDefaultPRBase(requestCtx, ctx.Login, ctx.Owner, ctx.Repo)
|
base, err = GetDefaultPRBase(requestCtx, ctx.Login, ctx.Owner, ctx.Repo)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// default is current one
|
// default is current one
|
||||||
if len(head) == 0 {
|
if len(head) == 0 {
|
||||||
if ctx.LocalRepo == nil {
|
if ctx.LocalRepo == nil {
|
||||||
return fmt.Errorf("no local git repo detected, please specify head branch")
|
return nil, fmt.Errorf("no local git repo detected, please specify head branch")
|
||||||
}
|
}
|
||||||
headOwner, headBranch, err := GetDefaultPRHead(ctx.LocalRepo)
|
headOwner, headBranch, err := GetDefaultPRHead(ctx.LocalRepo)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
head = GetHeadSpec(headOwner, headBranch, ctx.Owner)
|
head = GetHeadSpec(headOwner, headBranch, ctx.Owner)
|
||||||
|
|
@ -49,7 +50,7 @@ func CreatePull(requestCtx stdctx.Context, ctx *context.TeaContext, base, head s
|
||||||
|
|
||||||
// head & base may not be the same
|
// head & base may not be the same
|
||||||
if head == base {
|
if head == base {
|
||||||
return fmt.Errorf("can't create PR from %s to %s", head, base)
|
return nil, fmt.Errorf("can't create PR from %s to %s", head, base)
|
||||||
}
|
}
|
||||||
|
|
||||||
// default is head branch name
|
// default is head branch name
|
||||||
|
|
@ -58,7 +59,7 @@ func CreatePull(requestCtx stdctx.Context, ctx *context.TeaContext, base, head s
|
||||||
}
|
}
|
||||||
// title is required
|
// title is required
|
||||||
if len(opts.Title) == 0 {
|
if len(opts.Title) == 0 {
|
||||||
return fmt.Errorf("title is required")
|
return nil, fmt.Errorf("title is required")
|
||||||
}
|
}
|
||||||
|
|
||||||
client := ctx.Login.Client()
|
client := ctx.Login.Client()
|
||||||
|
|
@ -74,7 +75,7 @@ func CreatePull(requestCtx stdctx.Context, ctx *context.TeaContext, base, head s
|
||||||
Deadline: opts.Deadline,
|
Deadline: opts.Deadline,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("could not create PR from %s to %s:%s: %s", head, ctx.Owner, base, err)
|
return nil, fmt.Errorf("could not create PR from %s to %s:%s: %s", head, ctx.Owner, base, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if allowMaintainerEdits != nil && pr.AllowMaintainerEdit != *allowMaintainerEdits {
|
if allowMaintainerEdits != nil && pr.AllowMaintainerEdit != *allowMaintainerEdits {
|
||||||
|
|
@ -82,13 +83,11 @@ func CreatePull(requestCtx stdctx.Context, ctx *context.TeaContext, base, head s
|
||||||
AllowMaintainerEdit: allowMaintainerEdits,
|
AllowMaintainerEdit: allowMaintainerEdits,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("could not enable maintainer edit on pull: %v", err)
|
return nil, fmt.Errorf("could not enable maintainer edit on pull: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
print.PullDetails(pr, nil, nil)
|
return pr, nil
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetDefaultPRBase retrieves the default base branch for the given repo
|
// GetDefaultPRBase retrieves the default base branch for the given repo
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,36 @@ func PullMerge(requestCtx stdctx.Context, login *config.Login, repoOwner, repoNa
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if !success {
|
if success {
|
||||||
return fmt.Errorf("failed to merge PR, is it still open?")
|
return nil
|
||||||
|
}
|
||||||
|
return fmt.Errorf("failed to merge PR #%d: %s", index,
|
||||||
|
mergeFailureReason(requestCtx, client, repoOwner, repoName, index))
|
||||||
|
}
|
||||||
|
|
||||||
|
// mergeFailureReason returns why merging was refused. The SDK reports refusal as
|
||||||
|
// success=false and discards Gitea's explanatory body, so the reason has to be
|
||||||
|
// re-derived from the PR. Costs one API call, on the failure path only.
|
||||||
|
func mergeFailureReason(requestCtx stdctx.Context, client *gitea.Client, repoOwner, repoName string, index int64) string {
|
||||||
|
// Fallback naming the conditions tea cannot observe, used when the PR looks
|
||||||
|
// mergeable but the merge was refused anyway.
|
||||||
|
const refused = "the server refused the merge; check required status checks, requested reviews, or branch protection rules"
|
||||||
|
|
||||||
|
pr, _, err := client.PullRequests.GetPullRequest(requestCtx, repoOwner, repoName, index)
|
||||||
|
if err != nil || pr == nil {
|
||||||
|
return refused
|
||||||
|
}
|
||||||
|
|
||||||
|
switch {
|
||||||
|
case pr.HasMerged:
|
||||||
|
return "it has already been merged"
|
||||||
|
case pr.State == gitea.StateClosed:
|
||||||
|
return "it is closed"
|
||||||
|
case pr.Draft:
|
||||||
|
return "it is a draft; mark it ready for review first"
|
||||||
|
case !pr.Mergeable:
|
||||||
|
return "it has conflicting files or is otherwise not mergeable"
|
||||||
|
default:
|
||||||
|
return refused
|
||||||
}
|
}
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
146
modules/task/pull_merge_test.go
Normal file
146
modules/task/pull_merge_test.go
Normal file
|
|
@ -0,0 +1,146 @@
|
||||||
|
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package task
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
gitea "gitea.dev/sdk"
|
||||||
|
|
||||||
|
"gitea.dev/tea/modules/config"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
// mergeTestServer answers the merge POST with mergeStatus and the PR GET with
|
||||||
|
// prJSON, or a 404 if prJSON is empty.
|
||||||
|
func mergeTestServer(t *testing.T, prJSON string, mergeStatus int) *httptest.Server {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
switch {
|
||||||
|
case r.Method == http.MethodPost && strings.HasSuffix(r.URL.Path, "/merge"):
|
||||||
|
w.WriteHeader(mergeStatus)
|
||||||
|
// Gitea explains itself here; the SDK discards it.
|
||||||
|
_, _ = w.Write([]byte(`{"message":"Please try again later"}`))
|
||||||
|
case r.Method == http.MethodGet:
|
||||||
|
if prJSON == "" {
|
||||||
|
w.WriteHeader(http.StatusNotFound)
|
||||||
|
_, _ = w.Write([]byte(`{"message":"pull request does not exist"}`))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_, _ = w.Write([]byte(prJSON))
|
||||||
|
default:
|
||||||
|
t.Errorf("unexpected request: %s %s", r.Method, r.URL.Path)
|
||||||
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
func pullJSON(state string, merged, draft, mergeable bool) string {
|
||||||
|
return fmt.Sprintf(
|
||||||
|
`{"number":3,"state":%q,"merged":%t,"draft":%t,"mergeable":%t,"head":{"sha":"abc123"}}`,
|
||||||
|
state, merged, draft, mergeable)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPullMerge(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
pr string
|
||||||
|
mergeStatus int
|
||||||
|
wantErr string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "success",
|
||||||
|
pr: pullJSON("open", false, false, true),
|
||||||
|
mergeStatus: http.StatusOK,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "created is also success",
|
||||||
|
pr: pullJSON("open", false, false, true),
|
||||||
|
mergeStatus: http.StatusCreated,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// gitea/tea#1022: an open PR with conflicts was reported as
|
||||||
|
// possibly not open.
|
||||||
|
name: "conflicting files",
|
||||||
|
pr: pullJSON("open", false, false, false),
|
||||||
|
mergeStatus: http.StatusMethodNotAllowed,
|
||||||
|
wantErr: "failed to merge PR #3: it has conflicting files or is otherwise not mergeable",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "already merged",
|
||||||
|
pr: pullJSON("closed", true, false, false),
|
||||||
|
mergeStatus: http.StatusMethodNotAllowed,
|
||||||
|
wantErr: "failed to merge PR #3: it has already been merged",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "closed",
|
||||||
|
pr: pullJSON("closed", false, false, false),
|
||||||
|
mergeStatus: http.StatusMethodNotAllowed,
|
||||||
|
wantErr: "failed to merge PR #3: it is closed",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "draft",
|
||||||
|
pr: pullJSON("open", false, true, false),
|
||||||
|
mergeStatus: http.StatusMethodNotAllowed,
|
||||||
|
wantErr: "failed to merge PR #3: it is a draft; mark it ready for review first",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// Open and mergeable, yet refused.
|
||||||
|
name: "refused while mergeable",
|
||||||
|
pr: pullJSON("open", false, false, true),
|
||||||
|
mergeStatus: http.StatusMethodNotAllowed,
|
||||||
|
wantErr: "failed to merge PR #3: the server refused the merge; check required status checks, requested reviews, or branch protection rules",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
server := mergeTestServer(t, tt.pr, tt.mergeStatus)
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
err := PullMerge(t.Context(), &config.Login{
|
||||||
|
Name: "test",
|
||||||
|
URL: server.URL,
|
||||||
|
Token: "secret-token",
|
||||||
|
VersionCheck: false,
|
||||||
|
}, "owner", "repo", 3, gitea.MergePullRequestOption{Style: gitea.MergeStyleMerge})
|
||||||
|
|
||||||
|
if tt.wantErr == "" {
|
||||||
|
require.NoError(t, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
require.Error(t, err)
|
||||||
|
assert.Equal(t, tt.wantErr, err.Error())
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A refusal must still explain itself when the follow-up PR lookup fails.
|
||||||
|
func TestPullMergeReasonUnavailable(t *testing.T) {
|
||||||
|
server := mergeTestServer(t, "", http.StatusMethodNotAllowed)
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
err := PullMerge(t.Context(), &config.Login{
|
||||||
|
Name: "test",
|
||||||
|
URL: server.URL,
|
||||||
|
Token: "secret-token",
|
||||||
|
VersionCheck: false,
|
||||||
|
}, "owner", "repo", 3, gitea.MergePullRequestOption{
|
||||||
|
Style: gitea.MergeStyleMerge,
|
||||||
|
// Set so the SDK skips its own pre-merge PR lookup.
|
||||||
|
HeadCommitId: "abc123",
|
||||||
|
})
|
||||||
|
|
||||||
|
require.Error(t, err)
|
||||||
|
assert.Equal(t, "failed to merge PR #3: the server refused the merge; check required status checks, requested reviews, or branch protection rules", err.Error())
|
||||||
|
}
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
{
|
{
|
||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||||
"extends": [
|
"extends": [
|
||||||
"local>gitea/renovate-config",
|
"local>gitea/renovate-config"
|
||||||
"local>gitea/renovate-config:security",
|
|
||||||
"local>gitea/renovate-config:go-deps"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,13 +6,9 @@
|
||||||
# Cloudflare R2 bucket, using curl's built-in AWS SigV4 signer (R2 is
|
# Cloudflare R2 bucket, using curl's built-in AWS SigV4 signer (R2 is
|
||||||
# S3-API compatible).
|
# S3-API compatible).
|
||||||
#
|
#
|
||||||
# This is the R2 half of the release process's parallel S3+R2 upload
|
# It is invoked once per release artifact via a goreleaser
|
||||||
# period: goreleaser's `blobs:` pipe still uploads every release
|
# `publishers:` entry, and is the only artifact storage upload in the
|
||||||
# artifact to AWS S3, and this script is invoked once per artifact
|
# release process.
|
||||||
# (via a goreleaser `publishers:` entry) to mirror the same artifact
|
|
||||||
# into R2. Once the migration away from S3 is complete, the `blobs:`
|
|
||||||
# block and the AWS_* secrets can be dropped without touching this
|
|
||||||
# script.
|
|
||||||
#
|
#
|
||||||
# Usage:
|
# Usage:
|
||||||
# upload-r2.sh <local-file> <remote-key>
|
# upload-r2.sh <local-file> <remote-key>
|
||||||
|
|
@ -24,7 +20,7 @@
|
||||||
# preflight step in CI: goreleaser custom publishers run as the very
|
# preflight step in CI: goreleaser custom publishers run as the very
|
||||||
# last step of the publish pipeline, so without a preflight check a
|
# last step of the publish pipeline, so without a preflight check a
|
||||||
# missing R2_* secret would only be discovered after the Gitea release
|
# missing R2_* secret would only be discovered after the Gitea release
|
||||||
# has already been created and every artifact already uploaded to S3.
|
# has already been created.
|
||||||
#
|
#
|
||||||
# Required environment variables:
|
# Required environment variables:
|
||||||
# R2_ENDPOINT Base URL of the R2 endpoint, e.g.
|
# R2_ENDPOINT Base URL of the R2 endpoint, e.g.
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,8 @@ func TestRepoFromPath_Worktree(t *testing.T) {
|
||||||
assert.NoError(t, cmd.Run())
|
assert.NoError(t, cmd.Run())
|
||||||
cmd = exec.Command("git", "-C", mainRepoPath, "config", "user.name", "Test User")
|
cmd = exec.Command("git", "-C", mainRepoPath, "config", "user.name", "Test User")
|
||||||
assert.NoError(t, cmd.Run())
|
assert.NoError(t, cmd.Run())
|
||||||
|
cmd = exec.Command("git", "-C", mainRepoPath, "config", "commit.gpgsign", "false")
|
||||||
|
assert.NoError(t, cmd.Run())
|
||||||
|
|
||||||
cmd = exec.Command("git", "-C", mainRepoPath, "remote", "add", "origin", "https://gitea.com/owner/repo.git")
|
cmd = exec.Command("git", "-C", mainRepoPath, "remote", "add", "origin", "https://gitea.com/owner/repo.git")
|
||||||
assert.NoError(t, cmd.Run())
|
assert.NoError(t, cmd.Run())
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue