forked from fluxcd/source-controller
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(ref): fluxcd#1017 added name field for gitref
Signed-off-by: Christopher Paul Haar <[email protected]>
- Loading branch information
Christopher Paul Haar
committed
Feb 6, 2023
1 parent
ae3a81e
commit cb37490
Showing
5 changed files
with
178 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| Copyright 2021 The Flux authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package util | ||
|
|
||
| import ( | ||
| "errors" | ||
|
|
||
| "github.com/fluxcd/go-git/v5" | ||
| "github.com/fluxcd/go-git/v5/config" | ||
| "github.com/fluxcd/go-git/v5/storage/memory" | ||
| ) | ||
|
|
||
| type GitName struct { | ||
| rem git.Remote | ||
| } | ||
|
|
||
| func (g *GitName) GetGitCommitForName(name string, o *git.ListOptions) (string, error) { | ||
| refs, err := g.rem.List(o) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| branchCommit := "" | ||
| for _, ref := range refs { | ||
| if ref.Name().Short() == name { | ||
| if ref.Name().IsTag() { | ||
| return ref.Hash().String(), nil | ||
| } else if ref.Name().IsBranch() { | ||
| branchCommit = ref.Hash().String() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if branchCommit != "" { | ||
| return branchCommit, nil | ||
| } | ||
|
|
||
| return "", errors.New("no commit found for name:" + name) | ||
| } | ||
|
|
||
| func NewGitName(config *config.RemoteConfig) (GitName, error) { | ||
| return GitName{rem: *git.NewRemote(memory.NewStorage(), config)}, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| Copyright 2021 The Flux authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package util | ||
|
|
||
| import ( | ||
| "github.com/fluxcd/go-git/v5/plumbing/transport" | ||
| "github.com/fluxcd/go-git/v5/plumbing/transport/http" | ||
| gogit "github.com/fluxcd/go-git/v5/plumbing/transport/ssh" | ||
| git "github.com/fluxcd/pkg/git" | ||
| "golang.org/x/crypto/ssh" | ||
| ) | ||
|
|
||
| func AuthGit(authOpts *git.AuthOptions) (transport.AuthMethod, []byte, error) { | ||
|
|
||
| if authOpts.Transport == git.HTTPS { | ||
| if authOpts.BearerToken != "" { | ||
| return &http.TokenAuth{ | ||
| Token: authOpts.BearerToken, | ||
| }, authOpts.CAFile, nil | ||
| } | ||
| return &http.BasicAuth{ | ||
| Username: authOpts.Username, | ||
| Password: authOpts.Password, | ||
| }, authOpts.CAFile, nil | ||
| } | ||
|
|
||
| if authOpts.Transport == git.SSH { | ||
| if authOpts.Identity != nil { | ||
| var signer ssh.Signer | ||
| if authOpts.Password != "" { | ||
| var err error | ||
| signer, err = ssh.ParsePrivateKeyWithPassphrase([]byte(authOpts.Identity), []byte(authOpts.Password)) | ||
| if err != nil { | ||
| return nil, nil, err | ||
| } | ||
| } | ||
| //ToDo(haarchri): ssh: must specify HostKeyCallback" | ||
| return &gogit.PublicKeys{ | ||
| User: "git", | ||
| Signer: signer, | ||
| }, authOpts.CAFile, nil | ||
| } | ||
| } | ||
|
|
||
| return nil, nil, nil | ||
| } |