-
Notifications
You must be signed in to change notification settings - Fork 210
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Extensions: Adds extensions package #4718
Open
wbreza
wants to merge
7
commits into
Azure:main
Choose a base branch
from
wbreza:extensions-pkg
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,869
−0
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
3bf291b
Adds extensions package
wbreza b3ee50b
Fixes linter issues
wbreza f171591
Removes keys for now
wbreza 36235fa
Adds additional comments / docs for the registry and child components
wbreza 0aed45f
Rollback resources
wbreza d7a8cf9
Adds temp public keys
wbreza 8a37361
Unit tests for source manager and sources
wbreza File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package extensions | ||
|
||
// Extension represents an installed extension. | ||
type Extension struct { | ||
Id string `json:"id"` | ||
Namespace string `json:"namespace"` | ||
DisplayName string `json:"displayName"` | ||
Description string `json:"description"` | ||
Version string `json:"version"` | ||
Usage string `json:"usage"` | ||
Path string `json:"path"` | ||
Source string `json:"source"` | ||
} |
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,65 @@ | ||
package extensions | ||
|
||
import ( | ||
"fmt" | ||
"os" | ||
"path/filepath" | ||
|
||
"github.com/azure/azure-dev/cli/azd/pkg/config" | ||
) | ||
|
||
// newFileSource creates a new file base registry source. | ||
func newFileSource(name string, path string) (Source, error) { | ||
absolutePath, err := getAbsolutePath(path) | ||
if err != nil { | ||
return nil, fmt.Errorf("failed converting path '%s' to absolute path, %w", path, err) | ||
} | ||
|
||
registryBytes, err := os.ReadFile(absolutePath) | ||
if err != nil { | ||
return nil, fmt.Errorf("failed reading file '%s', %w", path, err) | ||
} | ||
|
||
return newJsonSource(name, string(registryBytes)) | ||
} | ||
|
||
// getAbsolutePath converts a relative path to an absolute path. | ||
func getAbsolutePath(filePath string) (string, error) { | ||
// Check if the path is absolute | ||
if filepath.IsAbs(filePath) { | ||
return filePath, nil | ||
} | ||
|
||
roots := []string{} | ||
|
||
// Get the current working directory | ||
cwd, err := os.Getwd() | ||
if err != nil { | ||
return "", err | ||
} | ||
|
||
azdConfigPath, err := config.GetUserConfigDir() | ||
if err != nil { | ||
return "", err | ||
} | ||
|
||
roots = append(roots, cwd) | ||
roots = append(roots, azdConfigPath) | ||
|
||
for _, root := range roots { | ||
// Join the root directory with the relative path | ||
absolutePath := filepath.Join(root, filePath) | ||
|
||
// Normalize the path to handle any ".." or "." segments | ||
absolutePath, err = filepath.Abs(absolutePath) | ||
if err != nil { | ||
return "", err | ||
} | ||
|
||
if _, err := os.Stat(absolutePath); err == nil { | ||
return absolutePath, nil | ||
} | ||
} | ||
|
||
return "", fmt.Errorf("file '%s' was not found, %w", filePath, os.ErrNotExist) | ||
} | ||
Comment on lines
+27
to
+65
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
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,17 @@ | ||
package extensions | ||
|
||
import ( | ||
"encoding/json" | ||
"fmt" | ||
) | ||
|
||
// newJsonSource creates a new JSON base registry source. | ||
func newJsonSource(name string, jsonRegistry string) (Source, error) { | ||
var registry *Registry | ||
err := json.Unmarshal([]byte(jsonRegistry), ®istry) | ||
if err != nil { | ||
return nil, fmt.Errorf("unable to unmarshal extensions JSON %w", err) | ||
} | ||
|
||
return newRegistrySource(name, registry) | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.