Skip to content

Commit 905be55

Browse files
committed
Resolve merge conflicts for org search CLI commands
2 parents 8b12626 + 849e474 commit 905be55

File tree

557 files changed

+4481
-3842
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

557 files changed

+4481
-3842
lines changed

.github/workflows/generate-provider-docs.yml

Lines changed: 0 additions & 154 deletions
This file was deleted.

CLAUDE.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,28 @@
11
# CLAUDE.md - Guide for Working in this Repository
22

3-
- Read `STYLE-GUIDE.md` for styling information.
3+
** IMPORTANT **
4+
- Read `@STYLE-GUIDE.md` for styling information.
45
- Do not change the package manager to pnpm in `package.json`.
56
- Any new files must end with a newline.
7+
8+
9+
This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
10+
11+
## Build/Test/Lint Commands
12+
- Build site: `make build`
13+
- Serve locally: `make serve` or `make serve-all` (with asset rebuilding)
14+
- Lint code: `make lint`
15+
- Format code: `make format`
16+
- Run tests: `make test`
17+
- Test specific programs: `ONLY_TEST="program-name" ./scripts/programs/test.sh`
18+
19+
## Code Style Guidelines
20+
- **Markdown**: Use one line per paragraph or semantic line breaks (see STYLE-GUIDE.md)
21+
- **Headings**: First level (H1) uses title case, all other headings use sentence case
22+
- **Links**: Use Hugo's `relref` shortcode for internal links: `[Text]({{< relref "/path" >}})`
23+
- **Code Examples**: Place in `/static/programs` directory with language suffix naming convention
24+
- **TypeScript/JavaScript**: Follow tsconfig.json settings - no comments unless requested
25+
- **File Structure**: Follow existing conventions for placement of new content
26+
- **Includes**: Use Hugo shortcodes for shared content across articles
27+
- **Naming**: Use lowercase for non-proper nouns (e.g., "stack" not "Stack" in text)
28+

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,7 @@ We generate two kinds of reference documentation with this repository: language-
107107
We build and host language-specific SDK documentation for the following Pulumi packages:
108108

109109
* [pulumi](https://github.com/pulumi/pulumi)
110-
* [pulumi-awsx](https://github.com/pulumi/pulumi-awsx)
111-
* [pulumi-kubernetesx](https://github.com/pulumi/pulumi-kubernetesx)
112110
* [pulumi-policy](https://github.com/pulumi/pulumi-policy)
113-
* [pulumi-terraform](https://github.com/pulumi/pulumi-terraform)
114111

115112
The Node.js, Python, and .NET versions of these docs are built using language-specific tooling and checked into the repository as stand-alone docsets. (Go versions are sourced directly from GitHub and hosted at [pkg.go.dev](/github.com/pulumi/pulumi/sdk/v3/go/pulumi).)
116113

config/_default/menus.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,21 @@ iac:
239239
url: https://www.pulumi.com/docs/reference/pkg/nodejs/pulumi/pulumi/
240240
weight: 1
241241
identifier: iac-languages-javascript-sdk
242+
- name: Policy SDK docs
243+
parent: iac-languages-javascript
244+
url: https://www.pulumi.com/docs/reference/pkg/nodejs/pulumi/policy
245+
weight: 2
246+
identifier: iac-languages-javascript-policy-sdk
242247
- name: SDK docs
243248
parent: iac-languages-python
244249
url: https://www.pulumi.com/docs/reference/pkg/python/pulumi/
245250
weight: 1
246251
identifier: iac-languages-python-sdk
252+
- name: Policy SDK docs
253+
parent: iac-languages-python
254+
url: https://www.pulumi.com/docs/reference/pkg/python/pulumi_policy/
255+
weight: 2
256+
identifier: iac-languages-python-policy-sdk
247257
- name: SDK docs
248258
parent: iac-languages-go
249259
url: https://pkg.go.dev/github.com/pulumi/pulumi/sdk/v3/go/pulumi

content/aws-summit/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Pulumi + AWS Summit Tel Aviv
33
meta_desc: Join Pulumi at AWS Summit Tel Aviv 2025 to discover how leading organizations automate AWS infrastructure as code.
4-
meta_image: /images/tel-aviv-2025-meta.png
4+
meta_image: /images/aws-summit/tel-aviv-2025-meta.png
55
type: page
66
layout: aws-summit
77

0 commit comments

Comments
 (0)