pull latest from private mirror #129

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

Merged

cspath1 merged 193 commits into main from cspath/pull-from-private-mirror

Feb 3, 2026

.github/runs-on.yml

Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		_extends: .github-private
		_extends: .github-private

.github/workflows/ci.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ name: CI (build + client samples) @@
           - main
     env:
-      LD_API_KEY: ${{ secrets.LD_API_KEY }}
+      LD_API_KEY: ${{ secrets.LD_API_KEY }}
     permissions:
       contents: read
@@ Expand Down Expand Up / @@ -82,33 +82,9 @@ jobs: @@
           - name: Run Go sample
             env:
               GO111MODULE: 'on'
-            run: make
-      test-javascript:
-        runs-on: ubuntu-latest
-        needs: build
-        steps:
-          - uses: actions/checkout@v4
-          - name: Download targets
-            uses: actions/download-artifact@v4
-            with:
-              name: targets
-              path: targets
-          - uses: actions/setup-node@v4
-            with:
-              node-version: '20'
-          - name: Build JS client
-            working-directory: targets/api-client-javascript
             run: |
-              rm -rf node_modules dist
-              npm install
-              npx --yes babel src -d dist --plugins @babel/plugin-transform-modules-commonjs
-          # TODO: Fix this test
-          # - name: Run JS sample
-          #   run: |
-          #     cd samples/javascript
-          #     # Install the local package directly
-          #     npm install
-          #     node index.js
+              cd samples/go
+              make
       test-python:
         runs-on: ubuntu-latest
         needs: build
@@ Expand Down Expand Up / @@ -210,37 +186,16 @@ jobs: @@
               npm install
               npm run build
               npm start
-      test-php:
-        runs-on: ubuntu-latest
-        needs: build
-        steps:
-          - uses: actions/checkout@v4
-          - name: Download targets
-            uses: actions/download-artifact@v4
-            with:
-              name: targets
-              path: targets
-          - uses: shivammathur/setup-php@v2
-            with:
-                php-version: '8.1'
-          - name: Run PHP sample
-            working-directory: samples/php
-            run: |
-                echo '{"require":{"launchdarkly/api-client-php":"@dev","guzzlehttp/guzzle":"*"},"repositories":[{"type":"path","url":"../../targets/api-client-php","options":{"symlink":true}}]}' > composer.json
-                composer update
-                php index.php
       check-success:
         name: Check Success
         needs:
           - build
           - test-go
-          - test-javascript
           - test-python
           - test-ruby
           - test-java
           - test-typescript
-          - test-php
         if: always()
         runs-on: ubuntu-latest
         steps:
@@ Expand All / @@ -249,4 +204,4 @@ jobs: @@
               if printf '${{ toJSON(needs) }}' | grep --quiet --extended-regexp --ignore-case '"result": "(failure|cancelled)"'; then
                 printf "Tests failed or workflow cancelled:\n\n${{ toJSON(needs) }}"
                 exit 1
-              fi
+              fi

.github/workflows/release.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -51,15 +51,15 @@ jobs:
  
              s3_path_pairs: 'launchdarkly-releaser/java/code-signing-keyring.gpg = /home/runner/code-signing-keyring.gpg'

          - name: Prepare secrets

            run: |

              ./scripts/release/prepare.sh 

              ./scripts/release/prepare.sh

          - name: Build clients

            run: |

              export PATH=/opt/gradle/bin:/usr/local/go/bin:$HOME/.rubygems/bin:$PATH

              export GEM_HOME=$HOME/.rubygems

              java -XX:+PrintFlagsFinal -version | grep ThreadStackSize

              make

              # Verify that the generated client code can be built

              make BUILD_TARGETS="go java javascript python ruby typescript-axios" build_clients

              make BUILD_TARGETS="go java python ruby typescript-axios" build_clients

            # This step will:

            # * Push built clients to their respective Github repos

            # * Tag those commits with the release version

    @@ -77,11 +77,11 @@ jobs:
  
        needs: release

        strategy:

          matrix:

            repo: ['api-client-go', 'api-client-java', 'api-client-javascript', 'api-client-php', 'api-client-python', 'api-client-ruby', 'api-client-typescript']

            repo: ['api-client-go', 'api-client-java', 'api-client-python', 'api-client-ruby', 'api-client-typescript']

        steps:

          - uses: ncipollo/release-action@v1.14.0

            with:

              repo: ${{ matrix.repo }}

              token: ${{ secrets.BOT_TOKEN }}

              tag: v${{ inputs.releaseVersion }} 

              tag: v${{ inputs.releaseVersion }}

              body: ${{ inputs.changeLog }}

.ldrelease/build.sh

This file was deleted.

.ldrelease/config.yml

This file was deleted.

.ldrelease/prepare.sh

This file was deleted.

.ldrelease/publish-dry-run.sh

This file was deleted.

.ldrelease/publish.sh

This file was deleted.

.ldrelease/secrets.properties

This file was deleted.

CODEOWNERS

Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		* @launchdarkly/team-enterprise
		* @launchdarkly/team-fm-next

Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,17 +2,23 @@ SHELL = /bin/bash @@
     LD_RELEASE_VERSION ?= 0.0.1-SNAPSHOT
-    GENERATOR_VERSION=7.16.0
+    # IMPORTANT: Whenever updating this generator version, check if the ApiClient mustache files need corresponding updates.
+    #            We have copied of these into the swagger-codegen-templates directory. Look for code blocks notated by CUSTOM-START and CUSTOM-END.
+    #  - Go:         https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/go/client.mustache
+    #  - Java:       https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
+    #  - Python:     https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/python/api_client.mustache
+    #  - Ruby:       https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/ruby-client/api_client.mustache
+    #  - Typescript: https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache
+    GENERATOR_VERSION=7.18.0
     GENERATOR_JAR=openapi-generator-cli-${GENERATOR_VERSION}.jar
     GENERATOR_DOWNLOAD_URL=https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/${GENERATOR_VERSION}/${GENERATOR_JAR}
     OPENAPI_JSON_URL=https://app.launchdarkly.com/api/v2/openapi.json
+    LATEST_API_VERSION=20240415 # the API version (for the LD-API-Version header value) corresponding to what is specified in this OpenAPI spec
     API_TARGETS ?= \
     	go \
     	java \
-    	javascript \
-    	php \
     	python \
     	ruby \
     	typescript-axios
@@ Expand Down Expand Up / @@ -41,7 +47,9 @@ SAMPLES_PATH ?= ./samples @@
     # The following variables define any special command-line parameters that need to be passed
     # to openapi-generator for each language/platform.
-    CODEGEN_PARAMS_go = --additional-properties=packageName=ldapi \
+    CODEGEN_PARAMS_go = \
+    	-t $(TEMPLATES_PATH)/go \
+        --additional-properties=packageName=ldapi \
     	--additional-properties=disallowAdditionalPropertiesIfNotPresent=false \
     	--additional-properties=generateInterfaces=true \
     	--additional-properties=apiNameSuffix=Api \
@@ Expand All @@
     	--additional-properties=developerOrganization=LaunchDarkly \
     	--additional-properties=developerOrganizationUrl=https://launchdarkly.com \
     	--additional-properties=packageVersion=$(firstword $(subst ., ,$(TAG))) \
-    	-t $(TEMPLATES_PATH)/go
+        --additional-properties=launchDarklyApiVersion=${LATEST_API_VERSION}
     CODEGEN_PARAMS_java = \
     	-t $(TEMPLATES_PATH)/java \
     	--group-id com.launchdarkly \
@@ Expand All / @@ -70,42 +77,32 @@ CODEGEN_PARAMS_java = \ @@
     	--additional-properties=scmUrl="https://github.com/launchdarkly/api-client-java" \
     	--additional-properties=scmConnection='scm:git:git://github.com/launchdarkly/api-client-java.git' \
     	--additional-properties=scmDeveloperConnection='scm:git:ssh:git@github.com:launchdarkly/api-client-java.git' \
-    	--additional-properties=gradleProperties=systemProp.org.gradle.internal.http.connectionTimeout=300000$$'\n'systemProp.org.gradle.internal.http.socketTimeout=300000$$'\n'org.gradle.jvmargs=-Xss2m
-    CODEGEN_PARAMS_javascript = \
-    	-t $(TEMPLATES_PATH)/javascript \
-    	--additional-properties=projectName=launchdarkly-api \
-    	--additional-properties=projectVersion=$(TAG) \
-    	--additional-properties=projectDescription="Build custom integrations with the LaunchDarkly REST API" \
-    	--additional-properties=moduleName=LaunchDarklyApi
-    CODEGEN_PARAMS_php = \
-    	--additional-properties=packagePath=LaunchDarklyApi \
-    	--additional-properties=composerVendorName=launchdarkly \
-    	--additional-properties=composerProjectName=api-client-php \
-    	--additional-properties=invokerPackage=LaunchDarklyApi \
-    	--git-user-id=launchdarkly \
-    	--git-repo-id=api-client-php
+    	--additional-properties=gradleProperties=systemProp.org.gradle.internal.http.connectionTimeout=300000$$'\n'systemProp.org.gradle.internal.http.socketTimeout=300000$$'\n'org.gradle.jvmargs=-Xss2m \
+    	--additional-properties=launchDarklyApiVersion=${LATEST_API_VERSION}
     CODEGEN_PARAMS_python = \
     	--additional-properties=packageName=launchdarkly_api \
     	--additional-properties=packageVersion=$(TAG) \
+    	--additional-properties=launchDarklyApiVersion=${LATEST_API_VERSION}
     CODEGEN_PARAMS_typescript-axios = \
+    	-t $(TEMPLATES_PATH)/typescript \
     	--additional-properties=npmName=launchdarkly-api-typescript \
     	--additional-properties=npmVersion=$(TAG) \
     	--additional-properties=supportsES6=true \
-    	--additional-properties=axiosVersion=^1.13.1
+    	--additional-properties=axiosVersion=^1.13.1 \
+    	--additional-properties=launchDarklyApiVersion=${LATEST_API_VERSION}
     CODEGEN_PARAMS_ruby = \
-      --additional-properties=moduleName=LaunchDarklyApi \
-      --additional-properties=gemName=launchdarkly_api \
-      --additional-properties=gemVersion=$(TAG) \
+    	-t $(TEMPLATES_PATH)/ruby \
+        --additional-properties=moduleName=LaunchDarklyApi \
+        --additional-properties=gemName=launchdarkly_api \
+        --additional-properties=gemVersion=$(TAG) \
+    	--additional-properties=launchDarklyApiVersion=${LATEST_API_VERSION}
     SAMPLE_FILE_go = main.go
-    SAMPLE_FILE_javascript = index.js
     SAMPLE_FILE_python = main.py
     SAMPLE_FILE_ruby = main.rb
     SAMPLE_FILE_typescript-axios = index.ts
     SAMPLE_FORMAT_go = go
-    SAMPLE_FORMAT_javascript = js
     SAMPLE_FORMAT_python = python
     SAMPLE_FORMAT_ruby = ruby
     SAMPLE_FORMAT_typescript-axios = ts
@@ Expand Down @@

README.md

-Original file line number
+Diff line change
@@ Expand Up @@
     ## How releases work
-    This project is set up (via the files in `.ldrelease`) to work with LaunchDarkly's internal Releaser tool. Running a release via Releaser will execute the required `make` targets in the right order, sandboxed in a Docker container that contains all the necessary build tools. You can also do a "dry run" in Releaser, which does all of the _build_ steps and provides you with the build products, but does not push anything to GitHub or to package managers.
-    That is the preferred way of doing releases, but the `make` targets can also be run locally if necessary, as long as your local environment has all of the necessary tools installed (as defined by the Docker image selected in `.ldrelease/config.yml` and anything else that's installed in `.ldrelease/prepare.sh`). Here are more details about what they do:
-    * `make load_prior_targets`: Sets up the source repos for each client repository (such as `api-client-go`) as git submodules of the `targets` directory.
-    * `make all`: Generates the API spec, runs the OpenAPI code generator to create the code for each API client, and copies the generated code into the submodules in `targets`.
-    * `make build_clients`: Verifies that the generated code for each client can actually be built as a package. This runs the script for each client that is in `scripts/build`.
-    * `make push`: Pushes the changes in the submodules to the client repositories.
-    * `make push_dry_run`: Simulates what the result of `make push` would be.
-    * `make publish`: Pushes the client code to package managers, for platforms where this is applicable (such as NPM for the JavaScript clients). This runs the script for each client that is in `scripts/release`, if any.
-    * `make publish_dry_run`: Simulates what the result of `make publish` would be.This runs the script for each client that is in `scripts/build`, if any.
-    Or, if you just want to look at the generated code locally, run `make targets_docker` which is equivalent to `make all` but uses a Docker container, so that the only tool you need to have installed locally is Docker. The output will appear in `./targets`. This is a convenient way to validate any local changes that relate to code generation. If you are also making changes that affect how the client code is packaged or published, it is better to use the slower but more comprehensive method of a Releaser dry run.
-    When running any `make` targets locally, set the environment variable `$LD_RELEASE_VERSION` to the version you are releasing, such as "6.0.0". It is set automatically when releases are run through Releaser.
+    This project is set up to use [Github Actions](https://github.com/launchdarkly/ld-openapi-private/actions/workflows/release.yml) to release new versions.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

pull latest from private mirror #129

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!