Skip to content

Commit

Permalink
fix: unwrap error (#61)
Browse files Browse the repository at this point in the history
* refactor: error scope

* feat: add error unwrap func
  • Loading branch information
kudoas authored Aug 24, 2024
1 parent 881e801 commit 887f041
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 18 deletions.
20 changes: 12 additions & 8 deletions config/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,6 @@ var (
issue = os.Getenv("INPUT_ISSUE")
)

type EnvInvalidError struct {
message string
}

func (e *EnvInvalidError) Error() string {
return fmt.Sprintf("environment variable invalid error: %v", e.message)
}

func ProvideEnv() (*Env, error) {
r := strings.Split(repository, "/")
var (
Expand Down Expand Up @@ -73,3 +65,15 @@ func (e *Env) RepoName() string {
func (e *Env) IssueNumber() int {
return e.issueNumber
}

type EnvInvalidError struct {
message string
}

func (e *EnvInvalidError) Error() string {
return fmt.Sprintf("environment variable invalid error: %v", e.message)
}

func (e *EnvInvalidError) Unwrap() error {
return e
}
13 changes: 3 additions & 10 deletions infra/github/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,12 @@ func (g *githubClient) GetTrackedIssueNodeIDs(q *QueryRequest) ([]githubv4.ID, e
} `graphql:"issue(number: $issueNumber)"`
} `graphql:"repository(owner: $repositoryOwner, name: $repositoryName)"`
}

variables := map[string]interface{}{
"repositoryOwner": githubv4.String(q.RepositoryOwner),
"repositoryName": githubv4.String(q.RepositoryName),
"issueNumber": githubv4.Int(q.IssueNumber),
}

err := g.client.Query(g.context, &query, variables)
if err != nil {
if err := g.client.Query(g.context, &query, variables); err != nil {
return nil, err
}

Expand All @@ -44,15 +41,12 @@ func (g *githubClient) GetIssueNodeID(q *QueryRequest) (githubv4.ID, error) {
} `graphql:"issue(number: $issueNumber)"`
} `graphql:"repository(owner: $repositoryOwner, name: $repositoryName)"`
}

variables := map[string]interface{}{
"repositoryOwner": githubv4.String(q.RepositoryOwner),
"repositoryName": githubv4.String(q.RepositoryName),
"issueNumber": githubv4.Int(q.IssueNumber),
}

err := g.client.Query(g.context, &query, variables)
if err != nil {
if err := g.client.Query(g.context, &query, variables); err != nil {
return nil, err
}

Expand Down Expand Up @@ -136,8 +130,7 @@ func (g *githubClient) MutateIssue(input githubv4.UpdateIssueInput) error {
} `graphql:"updateIssue(input: $input)"`
}

err := g.client.Mutate(g.context, &mutation, input, nil)
if err != nil {
if err := g.client.Mutate(g.context, &mutation, input, nil); err != nil {
return err
}

Expand Down

0 comments on commit 887f041

Please sign in to comment.