Skip to content
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

Fix errors in api reference doc #262

Merged
merged 2 commits into from
Aug 12, 2024

Conversation

fjglira
Copy link
Contributor

@fjglira fjglira commented Aug 9, 2024

Fixes #251

As discussed with @luksa the changes are in the make target make gen-api-docs because we can't for now properly handle tabs replacement and new line deletion in the ast nodes because go fmt replaces the spaces by tabs by default and add those newlines. I'll check this behavior to see if it is a bug or if there is a way to avoid it

Signed-off-by: frherrer <frherrer@redhat.com>
@fjglira fjglira force-pushed the issue-251-fix branch 2 times, most recently from 1adc58f to fe48471 Compare August 9, 2024 17:13
Makefile.core.mk Outdated
@@ -385,6 +385,15 @@ gen-api-docs: ## Generate API documentation.
--renderer=markdown \
--output-path=$(OUTPUT_DOCS_PATH) \
--output-mode=group
@echo "The following replaces are applied to the generated markdown files as workaround"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would just add this and the following two lines as comments in the Makefile. It doesn't have to be shown every time we generate the docs IMO

Copy link
Collaborator

@dgn dgn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @fjglira!

Adding a hold in case you want turn the explanation into a comment in the Makefile, feel free to remove.

/hold

Signed-off-by: frherrer <frherrer@redhat.com>
@fjglira
Copy link
Contributor Author

fjglira commented Aug 12, 2024

LGTM, thanks @fjglira!

Adding a hold in case you want turn the explanation into a comment in the Makefile, feel free to remove.

/hold

Updated :)

@istio-testing istio-testing merged commit f6b8fe7 into istio-ecosystem:main Aug 12, 2024
11 checks passed
dgn pushed a commit to dgn/sail-operator that referenced this pull request Aug 13, 2024
* Fix errors in api reference doc

Signed-off-by: frherrer <frherrer@redhat.com>

* Replace eco information by comments in the make gen-api-docs target

Signed-off-by: frherrer <frherrer@redhat.com>

---------

Signed-off-by: frherrer <frherrer@redhat.com>
Signed-off-by: Daniel Grimm <dgrimm@redhat.com>
openshift-service-mesh-bot referenced this pull request in openshift-service-mesh-bot/sail-operator Aug 13, 2024
* upstream/main:
  Ensure `make gen-check` works when go mod cache is empty (openshift-service-mesh#270)
  Introduce RemoteIstio (openshift-service-mesh#202)
  api_transformer: use `go env` to detect mod cache dir (openshift-service-mesh#269)
  Add field values.experimental to API (openshift-service-mesh#264)
  Fix errors in tables for api reference documentation (openshift-service-mesh#263)
  Generate CNIGlobalConfig from GlobalConfig automatically (openshift-service-mesh#260)
  Fix errors in api reference doc (openshift-service-mesh#262)
  Rename `addTags` to `addComments` in API transformer (openshift-service-mesh#259)
  Add relatedImages to ClusterServiceVersion (openshift-service-mesh#243)
  Generate API from versions defined in go.mod (openshift-service-mesh#258)
  Fix issues identified during API review (openshift-service-mesh#254)

# Conflicts:
#	bundle/manifests/sailoperator.clusterserviceversion.yaml
istio-testing pushed a commit that referenced this pull request Aug 13, 2024
* Fix errors in api reference doc

Signed-off-by: frherrer <frherrer@redhat.com>

* Replace eco information by comments in the make gen-api-docs target

Signed-off-by: frherrer <frherrer@redhat.com>

---------

Signed-off-by: frherrer <frherrer@redhat.com>
Signed-off-by: Daniel Grimm <dgrimm@redhat.com>
openshift-service-mesh-bot referenced this pull request in openshift-service-mesh-bot/sail-operator Aug 13, 2024
* upstream/main:
  Add `RemoteIstio` to API concepts in docs (openshift-service-mesh#272)
  Ensure `make gen-check` works when go mod cache is empty (openshift-service-mesh#270)
  Introduce RemoteIstio (openshift-service-mesh#202)
  api_transformer: use `go env` to detect mod cache dir (openshift-service-mesh#269)
  Add field values.experimental to API (openshift-service-mesh#264)
  Fix errors in tables for api reference documentation (openshift-service-mesh#263)
  Generate CNIGlobalConfig from GlobalConfig automatically (openshift-service-mesh#260)
  Fix errors in api reference doc (openshift-service-mesh#262)
  Rename `addTags` to `addComments` in API transformer (openshift-service-mesh#259)
  Add relatedImages to ClusterServiceVersion (openshift-service-mesh#243)
  Generate API from versions defined in go.mod (openshift-service-mesh#258)
  Fix issues identified during API review (openshift-service-mesh#254)

# Conflicts:
#	bundle/manifests/sailoperator.clusterserviceversion.yaml
asmigala pushed a commit to asmigala/sail-operator that referenced this pull request Mar 2, 2025
…t/master-release-3.0-merge_upstream_release-1.0-a8adebe8

Automator: merge upstream changes to openshift-service-mesh/sail-operator@release-3.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Format errors in yaml examples in the api reference doc
3 participants