-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'hyperledger:main' into main
- Loading branch information
Showing
12 changed files
with
377 additions
and
31 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| // Copyright © 2021 Kaleido, Inc. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
| // 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 cmd | ||
|
|
||
| import ( | ||
| "errors" | ||
| "time" | ||
|
|
||
| "github.com/briandowns/spinner" | ||
| "github.com/hyperledger/firefly-cli/internal/log" | ||
| "github.com/hyperledger/firefly-cli/internal/stacks" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| var pullOptions stacks.PullOptions | ||
|
|
||
| var pullCmd = &cobra.Command{ | ||
| Use: "pull <stack_name>", | ||
| Short: "Pull a stack", | ||
| Long: `Pull a stack | ||
| Pull the images for a stack . | ||
| `, | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| var spin *spinner.Spinner | ||
| if fancyFeatures && !verbose { | ||
| spin = spinner.New(spinner.CharSets[11], 100*time.Millisecond) | ||
| spin.FinalMSG = "done" | ||
| logger = &log.SpinnerLogger{ | ||
| Spinner: spin, | ||
| } | ||
| } | ||
|
|
||
| stackManager := stacks.NewStackManager(logger) | ||
| if len(args) == 0 { | ||
| return errors.New("no stack specified") | ||
| } | ||
| stackName := args[0] | ||
|
|
||
| if err := stackManager.LoadStack(stackName); err != nil { | ||
| return err | ||
| } | ||
| if spin != nil { | ||
| spin.Start() | ||
| } | ||
| if err := stackManager.PullStack(verbose, &pullOptions); err != nil { | ||
| return err | ||
| } | ||
| if spin != nil { | ||
| spin.Stop() | ||
| } | ||
| return nil | ||
| }, | ||
| } | ||
|
|
||
| func init() { | ||
| pullCmd.Flags().IntVarP(&pullOptions.Retries, "retries", "r", 0, "Retry attempts to perform on image pull failure") | ||
|
|
||
| rootCmd.AddCommand(pullCmd) | ||
| } |
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,74 @@ | ||
| // Copyright © 2021 Kaleido, Inc. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
| // 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 core | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "io/ioutil" | ||
|
|
||
| "github.com/hyperledger/firefly-cli/pkg/types" | ||
| ) | ||
|
|
||
| func GetLatestReleaseManifest() (*types.VersionManifest, error) { | ||
| latestRelease, err := getLatestFireFlyRelease() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return GetReleaseManifest(latestRelease.TagName) | ||
| } | ||
|
|
||
| func GetReleaseManifest(version string) (*types.VersionManifest, error) { | ||
| manifest := &types.VersionManifest{} | ||
| if err := request("GET", fmt.Sprintf("https://raw.githubusercontent.com/hyperledger/firefly/%s/manifest.json", version), nil, &manifest); err != nil { | ||
| return nil, err | ||
| } | ||
| if manifest.FireFly == nil { | ||
| // Fill in the FireFly version number | ||
| manifest.FireFly = &types.ManifestEntry{ | ||
| Image: "ghcr.io/hyperledger/firefly", | ||
| Tag: version, | ||
| } | ||
| } | ||
| return manifest, nil | ||
| } | ||
|
|
||
| func getLatestFireFlyRelease() (*types.GitHubRelease, error) { | ||
| release := &types.GitHubRelease{} | ||
| if err := request("GET", "https://api.github.com/repos/hyperledger/firefly/releases/latest", nil, release); err != nil { | ||
| return nil, err | ||
| } | ||
| return release, nil | ||
| } | ||
|
|
||
| func ReadManifestFile(p string) (*types.VersionManifest, error) { | ||
| d, err := ioutil.ReadFile(p) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| var manifest *types.VersionManifest | ||
| err = json.Unmarshal(d, &manifest) | ||
|
|
||
| // If core is not specified in the manifest, use a locally built image called "firefly" | ||
| if manifest.FireFly == nil { | ||
| manifest.FireFly = &types.ManifestEntry{ | ||
| Image: "hyperledger/firefly", | ||
| Local: true, | ||
| } | ||
| } | ||
| return manifest, err | ||
| } |
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,52 @@ | ||
| // Copyright © 2021 Kaleido, Inc. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
| // 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 core | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestGetLatestFireFlyRelease(T *testing.T) { | ||
| gitHubRelease, err := getLatestFireFlyRelease() | ||
| assert.NoError(T, err) | ||
| assert.NotNil(T, gitHubRelease) | ||
| assert.NotEmpty(T, gitHubRelease.TagName) | ||
| } | ||
|
|
||
| func TestGetFireFlyManifest(T *testing.T) { | ||
| manifest, err := GetReleaseManifest("main") | ||
| assert.NoError(T, err) | ||
| assert.NotNil(T, manifest) | ||
| assert.NotNil(T, manifest.FireFly) | ||
| assert.NotNil(T, manifest.Ethconnect) | ||
| assert.NotNil(T, manifest.Fabconnect) | ||
| assert.NotNil(T, manifest.DataExchange) | ||
| assert.NotNil(T, manifest.Tokens) | ||
| } | ||
|
|
||
| func TestGetLatestReleaseManifest(T *testing.T) { | ||
| manifest, err := GetLatestReleaseManifest() | ||
| assert.NoError(T, err) | ||
| assert.NotNil(T, manifest) | ||
| assert.NotNil(T, manifest.FireFly) | ||
| assert.NotNil(T, manifest.Ethconnect) | ||
| assert.NotNil(T, manifest.Fabconnect) | ||
| assert.NotNil(T, manifest.DataExchange) | ||
| assert.NotNil(T, manifest.Tokens) | ||
| } |
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
Oops, something went wrong.