Rename to programs, clean a few things up

.github/workflows/scheduled-examples.yml → .github/workflows/scheduled-programs.yml

@@ -1,4 +1,4 @@
-name: Run tests
+name: Run example programs
 on:
   schedule:
     - cron: "0 8 * * *"
@@ -74,4 +74,4 @@ jobs:
           role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
 
       - name: Run the tests
-        run: make test-examples
+        run: make test-programs

.prettierignore

@@ -15,4 +15,4 @@ yarn-error.log
 themes/default/theme
 themes/default/assets
 themes/default/layouts
-themes/default/static/examples
+themes/default/static/programs

Makefile

@@ -80,5 +80,5 @@ new-learn-topic:
 new-template:
 	./scripts/content/new-template.sh
 
-test-examples:
-	./scripts/test-examples.sh preview
+test-programs:
+	./scripts/test-programs.sh preview

scripts/clean.sh

@@ -2,6 +2,8 @@
 
 set -o errexit -o pipefail
 
+git clean -fdX
+
 yarn cache clean
 hugo mod clean
 

scripts/test-examples.sh → scripts/test-programs.sh

@@ -5,9 +5,9 @@ set -euo pipefail
 pulumi whoami -v
 
 # Delete build/test artifacts.
-git clean -fdX themes/default/static/examples
+git clean -fdX themes/default/static/programs
 
-pushd themes/default/static/examples
+pushd themes/default/static/programs
     for dir in */; do
         project="$(basename $dir)"
 
@@ -29,9 +29,9 @@ pushd themes/default/static/examples
         # https://github.com/pulumi/pulumi-awsx/issues/820
         if [[ "$project" == "awsx-vpc-fargate-service-java" ]]; then
             continue
-        elif [[ "$project" == "load-balanced-fargate-ecr-java" ]]; then
+        elif [[ "$project" == "awsx-load-balanced-fargate-ecr-java" ]]; then
             continue
-        elif [[ "$project" == "load-balanced-fargate-nginx-java" ]]; then
+        elif [[ "$project" == "awsx-load-balanced-fargate-nginx-java" ]]; then
             continue
         fi
 

themes/default/content/docs/clouds/aws/guides/ecr.md

@@ -262,7 +262,7 @@ entirely from code. This lets you version and deploy container changes easily al
 
 In the following example, creating an `Image` resource will build an image from the "./app" directory (relative to our project and containing Dockerfile), and publish it to our ECR repository provisioned above.
 
-{{< example path="awsx-ecr-image" languages="javascript,typescript,python,go,csharp,java,yaml" >}}
+{{< example-program path="awsx-ecr-image" >}}
 
 As we run `pulumi up`, we will see Docker build output in the Pulumi CLI display. If there is an error, it'll
 be printed in the diagnostics section, but otherwise the resulting image name is printed:
@@ -311,7 +311,7 @@ defaults to `latest`). The container instances require IAM permissions which are
 
 To use your private repository from an ECS task definition, reference it like so:
 
-{{< example path="load-balanced-fargate-ecr" languages="javascript,typescript,python,go,csharp,java,yaml" >}}
+{{< example-program path="awsx-load-balanced-fargate-ecr" >}}
 
 For information about ECS, refer to the [Pulumi Crosswalk for AWS ECS documentation](/docs/clouds/aws/guides/ecs/). For
 information about consuming ECR images from ECS services specifically, see
@@ -321,7 +321,7 @@ information about consuming ECR images from ECS services specifically, see
 
 To use your private repository from a Kubernetes service, such as one using EKS, reference it like so:
 
-{{< example path="awsx-ecr-eks-deployment-service" languages="javascript,typescript,python,go,csharp,java,yaml" >}}
+{{< example-program path="awsx-ecr-eks-deployment-service" >}}
 
 For information about EKS, refer to the [Pulumi Crosswalk for AWS EKS documentation](/docs/clouds/aws/guides/eks/).
 

themes/default/content/docs/clouds/aws/guides/ecs.md

@@ -44,7 +44,7 @@ providing full control over the underlying EC2 machine resources that power your
 To run a Docker container in ECS using default network and cluster settings, use the `awsx.ecs.FargateService`
 class. Since we need to access this container over port 80 using a stable address, we will use a load balancer.
 
-{{< example path="load-balanced-fargate-nginx" languages="javascript,typescript,python,go,csharp,java,yaml" >}}
+{{< example-program path="awsx-load-balanced-fargate-nginx" >}}
 
 After deploying this program, `pulumi stack output url` can be used to access the Url output property. We can then access our  NGINX web server behind our load balancer via curl:
 
@@ -83,7 +83,7 @@ To create an ECS service inside of a VPC, we will first create or use an existin
 described in [Pulumi Crosswalk for AWS VPC](/docs/clouds/aws/guides/vpc/). Then we pass the subnets
 from that VPC into the network configuration argument for our cluster:
 
-{{< example path="awsx-vpc-fargate-service" languages="javascript,typescript,python,go,csharp,java,yaml" >}}
+{{< example-program path="awsx-vpc-fargate-service" >}}
 
 When using a custom VPC, you will also need to specify your own security groups if you need to allow ingress or egress.
 
@@ -115,7 +115,7 @@ it separately ahead of time. This makes it very easy to use private registration
 For example, specifying a `path` will run a `docker build` in that path, push the result up to the ECR repository that specified in the first argument, and then pass
 the private ECR repository path to the container:
 
-{{< example path="load-balanced-fargate-ecr" languages="javascript,typescript,python,go,csharp,java,yaml" >}}
+{{< example-program path="awsx-load-balanced-fargate-ecr" >}}
 
 For more information about using ECR, refer to [Pulumi Crosswalk for AWS ECR](/docs/clouds/aws/guides/ecr/).
 

themes/default/layouts/shortcodes/example-program-snippet.html

@@ -0,0 +1,44 @@
+{{- $path := .Get "path" -}}
+{{- $language := .Get "language" -}}
+{{- $from := .Get "from" -}}
+{{- $to := .Get "to" -}}
+{{- $program := "" -}}
+{{- $depfile := "" -}}
+{{- $deplang := "" -}}
+{{- if eq $language "javascript" -}}
+    {{- $program = "index.js" -}}
+    {{- $depfile = "package.json" -}}
+    {{- $deplang = "json" -}}
+{{- else if eq $language "typescript" -}}
+    {{- $program = "index.ts" -}}
+    {{- $depfile = "package.json" -}}
+    {{- $deplang = "json" -}}
+{{- else if eq $language "python" -}}
+    {{- $program = "__main__.py" -}}
+    {{- $depfile = "requirements.txt" -}}
+    {{- $deplang = "plain" -}}
+{{- else if eq $language "go" -}}
+    {{- $program = "main.go" -}}
+    {{- $depfile = "go.mod" -}}
+    {{- $deplang = "bash" -}}
+{{- else if eq $language "csharp" -}}
+    {{- $program = "Program.cs" -}}
+    {{- $depfile = printf "%s.csproj" (printf "%s-%s" $path $language) -}}
+    {{- $deplang = "xml" -}}
+{{- else if eq $language "java" -}}
+    {{- $program = "src/main/java/myproject/App.java" -}}
+    {{- $depfile = "pom.xml" -}}
+    {{- $deplang = "xml" -}}
+{{- else if eq $language "yaml" -}}
+    {{- $program = "Pulumi.yaml" -}}
+{{- end -}}
+{{- $file := readFile (path.Join "static" "programs" (printf "%s-%s" $path $language) $program) -}}
+{{- if and (ne $from "") (ne $to "") -}}
+    {{- $lines := split $file "\n" -}}
+    {{- $toEnd := after (sub (int $from) 1) $lines -}}
+    {{- $lineCount := add (sub (int $to) (int $from)) 1 -}}
+    {{- $toTo := first $lineCount $toEnd -}}
+    {{- delimit $toTo "\n" -}}
+{{- else -}}
+    {{- $file -}}
+{{- end -}}

themes/default/layouts/shortcodes/example-program.html

@@ -0,0 +1,67 @@
+{{ $path := .Get "path" }}
+{{ $languages := default "javascript,typescript,python,go,csharp,java,yaml" (.Get "languages") }}
+{{ $folder := path.Join "static" "programs" }}
+
+<div>
+    <pulumi-chooser type="language" options="{{ $languages }}"></pulumi-chooser>
+</div>
+
+{{ range $i, $language := split $languages "," }}
+    <div class="w-full">
+        <pulumi-choosable type="language" values="{{ $language }}">
+            <div>
+                {{ $program := "" }}
+                {{ $depfile := "" }}
+                {{ $deplang := "" }}
+                {{ if eq $language "javascript" }}
+                    {{ $program = "index.js" }}
+                    {{ $depfile = "package.json" }}
+                    {{ $deplang = "json" }}
+                {{ else if eq $language "typescript" }}
+                    {{ $program = "index.ts" }}
+                    {{ $depfile = "package.json" }}
+                    {{ $deplang = "json" }}
+                {{ else if eq $language "python" }}
+                    {{ $program = "__main__.py" }}
+                    {{ $depfile = "requirements.txt" }}
+                    {{ $deplang = "plain" }}
+                {{ else if eq $language "go" }}
+                    {{ $program = "main.go" }}
+                    {{ $depfile = "go.mod" }}
+                    {{ $deplang = "bash" }}
+                {{ else if eq $language "csharp" }}
+                    {{ $program = "Program.cs" }}
+                    {{ $depfile = printf "%s.csproj" (printf "%s-%s" $path $language) }}
+                    {{ $deplang = "xml" }}
+                {{ else if eq $language "java" }}
+                    {{ $program = "src/main/java/myproject/App.java" }}
+                    {{ $depfile = "pom.xml" }}
+                    {{ $deplang = "xml" }}
+                {{ else if eq $language "yaml" }}
+                    {{ $program = "Pulumi.yaml" }}
+                {{ end }}
+                {{ if and (ne $program "") (ne $depfile "") }}
+                    {{ $root := slice "static" "programs" (printf "%s-%s" $path $language) }}
+                    {{ $code := readFile (path.Join $root $program) }}
+                    {{ $deps := readFile (path.Join $root $depfile) }}
+                    {{ $info := os.Stat (path.Join $root) }}
+                    <div>
+                        {{ highlight $code $language }}
+                    </div>
+                    <!-- WIP: Show program dependencies.
+                    <div class="mt-0 mb-4 text-sm bg-gray-200 text-gray-700 rounded py-1 px-2 cursor-pointer">
+                        <details>
+                            <summary>{{ $depfile }}</summary>
+                            {{ if and (ne $depfile "") (ne $deplang "") }}
+                                <div>
+                                    {{ highlight $deps $deplang }}
+                                </div>
+                            {{ end }}
+                        </details>
+                    </div>
+                    -->
+                {{ end }}
+            </div>
+        </pulumi-choosable>
+    </div>
+{{ end }}

themes/default/layouts/shortcodes/example.html

@@ -1,35 +1,3 @@
-{{ $path := .Get "path" }}
-{{ $languages := .Get "languages" }}
-
-<div>
-    <pulumi-chooser type="language" options="{{ $languages }}"></pulumi-chooser>
+<div class="example-registry">
+    <pulumi-choosable type="language" values="{{ .Get 0 }}">{{ .Inner }}</pulumi-choosable>
 </div>
-
-{{ range $i, $language := split $languages "," }}
-    <div class="w-full">
-        <pulumi-choosable type="language" values="{{ $language }}">
-            <div>
-                {{ $program := "" }}
-                {{ if eq $language "javascript" }}
-                    {{ $program = "index.js" }}
-                {{ else if eq $language "typescript" }}
-                    {{ $program = "index.ts" }}
-                {{ else if eq $language "python" }}
-                    {{ $program = "__main__.py" }}
-                {{ else if eq $language "go" }}
-                    {{ $program = "main.go" }}
-                {{ else if eq $language "csharp" }}
-                    {{ $program = "Program.cs" }}
-                {{ else if eq $language "java" }}
-                    {{ $program = "src/main/java/myproject/App.java" }}
-                {{ else if eq $language "yaml" }}
-                    {{ $program = "Pulumi.yaml" }}
-                {{ end }}
-                {{ if ne $program "" }}
-                    {{ $code := readFile (path.Join "static" "examples" (printf "%s-%s" $path $language) $program) }}
-                    {{ highlight $code $language }}
-                {{ end }}
-            </div>
-        </pulumi-choosable>
-    </div>
-{{ end }}

themes/default/layouts/shortcodes/examples.html

@@ -0,0 +1,3 @@
+<div class="examples-registry">
+    <pulumi-examples>{{ .Inner }}</pulumi-examples>
+</div>

themes/default/static/examples/.gitignore → themes/default/static/programs/.gitignore

@@ -358,13 +358,13 @@ maven-status
 target/
 
 # Nested .gitignores.
-**/.gitignore
+/**/.gitignore
+!.gitignore
 
 # Lockfiles.
 go.sum
 package-lock.json
 yarn.lock
 
-
 # Stack config files.
 Pulumi.*.yaml

themes/default/static/programs/awsx-ecr-eks-deployment-service-csharp/Pulumi.yaml

@@ -0,0 +1,2 @@
+name: awsx-ecr-eks-deployment-service-csharp
+runtime: dotnet

themes/default/static/examples/awsx-ecr-eks-deployment-service-java/Pulumi.yaml → themes/default/static/programs/awsx-ecr-eks-deployment-service-java/Pulumi.yaml

@@ -1,3 +1,2 @@
 name: awsx-ecr-eks-deployment-service-java
 runtime: java
-description: A minimal AWS Java Pulumi program

themes/default/static/examples/awsx-ecr-eks-deployment-service-python/Pulumi.yaml → themes/default/static/programs/awsx-ecr-eks-deployment-service-python/Pulumi.yaml

@@ -3,4 +3,3 @@ runtime:
   name: python
   options:
     virtualenv: venv
-description: A Python program to deploy a Kubernetes cluster on AWS

themes/default/static/programs/awsx-ecr-image-csharp/Pulumi.yaml

@@ -0,0 +1,2 @@
+name: awsx-ecr-image-csharp
+runtime: dotnet

themes/default/static/programs/awsx-ecr-image-go/Pulumi.yaml

@@ -0,0 +1,2 @@
+name: awsx-ecr-image-go
+runtime: go

themes/default/static/programs/awsx-ecr-image-java/Pulumi.yaml

@@ -0,0 +1,2 @@
+name: awsx-ecr-image-java
+runtime: java

themes/default/static/examples/awsx-ecr-image-javascript/Pulumi.yaml → themes/default/static/programs/awsx-ecr-image-javascript/Pulumi.yaml

@@ -3,4 +3,3 @@ runtime:
   name: nodejs
   options:
     typescript: false
-description: A minimal AWS JavaScript Pulumi program