Skip to content

Commit 2f4cda4

Browse files
committed
review nits and remove redundant matrix related config from workflows
1 parent 4a22de7 commit 2f4cda4

7 files changed

Lines changed: 6 additions & 12 deletions

File tree

.github/workflows/unit-test-data-api-differ.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ on:
1010
jobs:
1111
test:
1212
runs-on: ubuntu-latest
13-
strategy:
14-
fail-fast: true
1513
steps:
1614
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
1715
with:

.github/workflows/unit-test-data-api-v2.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ on:
1111
jobs:
1212
test:
1313
runs-on: ubuntu-latest
14-
strategy:
15-
fail-fast: true
1614
steps:
1715
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
1816
with:

tools/data-api/internal/endpoints/routing.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func Router(workingDirectory string, serviceNames *[]string) func(chi.Router) {
3737
}
3838
v1.Router(r, opts, serviceRepo)
3939
})
40-
router.Route("/v1/data-plane/", func(r chi.Router) {
40+
router.Route("/v1/data-plane", func(r chi.Router) {
4141
opts := v1.Options{
4242
ServiceType: sdkModels.DataPlaneSourceDataType,
4343
UriPrefix: "/v1/data-plane",

tools/generator-go-sdk/internal/cmd/generate.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ func (g GenerateCommand) Run(args []string) int {
107107
input.settings.DeleteExistingResourcesForVersion = false
108108
input.settings.GenerateDescriptionsForModels = false
109109
input.settings.RecurseParentModels = true
110-
// input.settings.UseOldBaseLayerFor("KeyVault")
111110
}
112111
}
113112

tools/generator-go-sdk/internal/generator/templater_id_parser.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@ func (r *resourceIdTemplater) methods(sourceType models.SourceDataType) (*string
160160
if sourceType == models.DataPlaneSourceDataType {
161161
functionBody, err = r.pathFunction()
162162
if err != nil {
163-
return nil, fmt.Errorf("generating ID function: %+v", err)
163+
return nil, fmt.Errorf("generating Path function: %+v", err)
164164
}
165165
methods = append(methods, *functionBody)
166166
functionBody, err = r.pathElementsFunction()
167167
if err != nil {
168-
return nil, fmt.Errorf("generating ID function: %+v", err)
168+
return nil, fmt.Errorf("generating PathElements function: %+v", err)
169169
}
170170
methods = append(methods, *functionBody)
171171
}

tools/importer-rest-api-specs/internal/cmd/import_data_plane.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ func NewImportDataPlaneCommand(restAPISpecsRepositoryDirectoryPath, datPlaneConf
1919
return func() (cli.Command, error) {
2020
return ImportDataPlaneCommand{
2121
outputDirectory: outputDirectory,
22-
datPlaneConfigPath: datPlaneConfigPath,
22+
dataPlaneConfigPath: datPlaneConfigPath,
2323
restAPISpecsRepositoryDirectoryPath: restAPISpecsRepositoryDirectoryPath,
2424
}, nil
2525
}
2626
}
2727

2828
type ImportDataPlaneCommand struct {
2929
outputDirectory string
30-
datPlaneConfigPath string
30+
dataPlaneConfigPath string
3131
restAPISpecsRepositoryDirectoryPath string
3232
}
3333

@@ -52,7 +52,7 @@ func (c ImportDataPlaneCommand) Run(args []string) int {
5252

5353
opts := pipeline.Options{
5454
APIDefinitionsDirectory: c.outputDirectory,
55-
ConfigFilePath: c.datPlaneConfigPath,
55+
ConfigFilePath: c.dataPlaneConfigPath,
5656
ProviderPrefix: "azurerm",
5757
RestAPISpecsDirectory: c.restAPISpecsRepositoryDirectoryPath,
5858
ServiceNamesToLimitTo: serviceNames,

tools/importer-rest-api-specs/internal/components/discovery/for_api_version.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ func discoverDataSetForAPIVersion(apiVersion string, filePaths []string, sourceD
3030
// So just handling the directory name here is fine
3131
shouldIgnore := false
3232
for _, item := range strings.Split(filePath, fmt.Sprintf("%c", filepath.Separator)) {
33-
// TODO - Fix this
3433
switch {
3534
case sourceDataType == sdkModels.DataPlaneSourceDataType && strings.EqualFold(item, "resource-manager"):
3635
logging.Tracef("path contains `resource-manager`, skipping..")

0 commit comments

Comments
 (0)