Skip to content
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
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions cli/azd/pkg/extensions/extension.go
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"`
}
65 changes: 65 additions & 0 deletions cli/azd/pkg/extensions/file_source.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package extensions
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
package extensions
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

filepath.Abs(absolutePath) is enough here. I don't think you need what you have here

17 changes: 17 additions & 0 deletions cli/azd/pkg/extensions/json_source.go
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), &registry)
if err != nil {
return nil, fmt.Errorf("unable to unmarshal extensions JSON %w", err)
}

return newRegistrySource(name, registry)
}
Loading
Loading