Skip to content

Upgrade #2842

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.

Sign up for GitHub

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

Merged
danielrbradley merged 4 commits into from
Oct 24, 2023
Merged

Upgrade #2842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0756b9
Write version files on schema gen failure
danielrbradley Oct 23, 2023
3d79a40
Exclude new Migrate.AssessmentOperation resource
danielrbradley Oct 23, 2023
7fac080
Upgrade specs
danielrbradley Oct 23, 2023
baae903
Generate SDKs
danielrbradley Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion azure-rest-api-specs
Open in desktop
Submodule azure-rest-api-specs updated 1397 files
8 changes: 4 additions & 4 deletions provider/cmd/pulumi-gen-azure-native/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,7 @@ func main() {

switch languages {
case "schema":
buildSchemaResult, err := versioning.BuildSchema(buildSchemaArgs)
if err != nil {
panic(err)
}
buildSchemaResult, buildSchemaErr := versioning.BuildSchema(buildSchemaArgs)

if namespaces == "*" && apiVersions == "" {
written, err := buildSchemaResult.Version.WriteTo("versions")
Expand All @@ -99,6 +96,9 @@ func main() {
} else {
fmt.Println("Note: skipping writing version metadata and reports because DEBUG_CODEGEN_NAMESPACES or DEBUG_CODEGEN_APIVERSIONS is set.")
}
if buildSchemaErr != nil {
panic(buildSchemaErr)
}
if codegenSchemaOutputPath == "" {
codegenSchemaOutputPath = path.Join("bin", "schema-full.json")
}
Expand Down
7 changes: 6 additions & 1 deletion provider/pkg/versioning/build_schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,12 @@ func BuildSchema(args BuildSchemaArgs) (*BuildSchemaResult, error) {

generationResult, err := gen.PulumiSchema(args.RootDir, providers, versionMetadata)
if err != nil {
return nil, err
return &BuildSchemaResult{
PackageSpec: schema.PackageSpec{},
Metadata: resources.AzureAPIMetadata{},
Version: versionMetadata,
Reports: BuildSchemaReports{},
}, err
}

pkgSpec := generationResult.Schema
Expand Down
Loading