Skip to content

Commit

Permalink
Merge pull request #520 from ditrit/improvement/update_plugin-core
Browse files Browse the repository at this point in the history
Improvement: update plugin core
  • Loading branch information
Zorin95670 authored Jul 11, 2024
2 parents 2deff17 + 264ceaf commit 258952e
Show file tree
Hide file tree
Showing 12 changed files with 334 additions and 350 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ jobs:
run: |
npm install -g [email protected] && \
npm ci && \
npm run plugin:install -- repository-name="githubator-plugin" repository-url="https://github.com/ditrit/githubator-plugin.git#0.3.3" && \
npm run plugin:install -- repository-name="terrator-plugin" repository-url="https://github.com/ditrit/terrator-plugin.git#0.8.1" && \
npm run plugin:install -- repository-name="githubator-plugin" repository-url="https://github.com/ditrit/githubator-plugin.git#0.4.1" && \
npm run plugin:install -- repository-name="terrator-plugin" repository-url="https://github.com/ditrit/terrator-plugin.git#0.10.0" && \
npm run plugin:init && \
docker build -t leto-modelizer -f DockerfileE2E .
- name: Run application
Expand Down
9 changes: 5 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,20 @@ To run all the e2e tests, you need to run the application with ALL official plug

```bash
npm ci
npm run plugin:install -- repository-name="terrator-plugin" repository-url="https://github.com/ditrit/terrator-plugin.git#0.8.1"
npm run plugin:install -- repository-name="githubator-plugin" repository-url="https://github.com/ditrit/githubator-plugin.git#0.3.3"
npm run plugin:install -- repository-name="terrator-plugin" repository-url="https://github.com/ditrit/terrator-plugin.git#0.10.0"
npm run plugin:install -- repository-name="githubator-plugin" repository-url="https://github.com/ditrit/githubator-plugin.git#0.4.1"
npm run plugin:init
TEMPLATE_LIBRARY_BASE_URL="https://raw.githubusercontent.com/ditrit/leto-modelizer-templates-library/leto-modelizer/e2e_test" npm run dev
```

### Run the e2e tests locally with specific proxy

1. Install terrator-plugin
1. Install terrator-plugin and githubator-plugin

```bash
npm ci
npm run plugin:install -- repository-name="terrator-plugin" repository-url="https://github.com/ditrit/terrator-plugin.git#0.8.1"
npm run plugin:install -- repository-name="terrator-plugin" repository-url="https://github.com/ditrit/terrator-plugin.git#0.10.0"
npm run plugin:install -- repository-name="githubator-plugin" repository-url="https://github.com/ditrit/githubator-plugin.git#0.4.1"
npm run plugin:init
```

Expand Down
34 changes: 20 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,19 @@ For now, we don't have many plugins to offer you, but follow us and in the next

Plugin to manage terraform files, by default it comes with aws provider definition.

[GitHub url](https://github.com/ditrit/terrator-plugin#0.8.1)
[GitHub url](https://github.com/ditrit/terrator-plugin#0.10.0)

### Github plugin

Plugin to manage github action files.
Plugin to manage GitHub action files.

[GitHub url](https://github.com/ditrit/githubator-plugin#0.3.3)
[GitHub url](https://github.com/ditrit/githubator-plugin#0.4.1)

### Kubernetes plugin

Plugin to manage Kubernetes files.

[GitHub url](https://github.com/ditrit/kubernator-plugin#0.2.0)

## Compatibility versions table

Expand Down Expand Up @@ -104,10 +110,10 @@ Plugin to manage github action files.
</tr>
<tr>
<td>next version</td>
<td>= 0.24.1</td>
<td>= 0.8.1</td>
<td>= 0.3.3</td>
<td>= 0.1.0</td>
<td>= 0.25.0</td>
<td>= 0.10.0</td>
<td>= 0.4.1</td>
<td>= 0.2.0</td>
</tr>
</tbody>
</table>
Expand Down Expand Up @@ -140,27 +146,27 @@ Choose __Custom plugin__ to install a specific plugin not referenced as an offic
Examples with official plugins:
- terrator-plugin:
- plugin name: `terrator-plugin`
- git repository url: `https://github.com/ditrit/terrator-plugin.git#0.8.1`
- git repository url: `https://github.com/ditrit/terrator-plugin.git#0.10.0`
- githubator-plugin:
- plugin name: `githubator-plugin`
- git repository url: `https://github.com/ditrit/githubator-plugin.git#0.3.3`
- git repository url: `https://github.com/ditrit/githubator-plugin.git#0.4.1`
- kubernator-plugin:
- plugin name: `kubernator-plugin`
- git repository url: `https://github.com/ditrit/kubernator-plugin.git#0.1.0`
- git repository url: `https://github.com/ditrit/kubernator-plugin.git#0.2.0`

### Install custom plugin in command line

Options `repository-name` and `repository-url` can be added with the `npm run plugin:install` command to bypass cli prompts.

```bash
# Example with terraform plugin
npm run plugin:install -- repository-name="terrator-plugin" repository-url="https://github.com/ditrit/terrator-plugin.git#0.8.1"
npm run plugin:install -- repository-name="terrator-plugin" repository-url="https://github.com/ditrit/terrator-plugin.git#0.10.0"

# Example with github action plugin
npm run plugin:install -- repository-name="githubator-plugin" repository-url="https://github.com/ditrit/githubator-plugin.git#0.3.3"
npm run plugin:install -- repository-name="githubator-plugin" repository-url="https://github.com/ditrit/githubator-plugin.git#0.4.1"

# Example with kubernator plugin
npm run plugin:install -- repository-name="kubernator-plugin" repository-url="https://github.com/ditrit/kubernator-plugin.git#0.1.0"
npm run plugin:install -- repository-name="kubernator-plugin" repository-url="https://github.com/ditrit/kubernator-plugin.git#0.2.0"
```

Now that your plugin is installed, you can continue to install other plugins with the same command if you want.
Expand Down Expand Up @@ -204,7 +210,7 @@ It will generate the built application in the `dist` folder.

To build this app with docker (the two main plugins for terraform & github are included), please use this command:
```bash
docker build . -build-arg TERRATOR_PLUGIN_VERSION="0.8.1" -build-arg GITHUBATOR_PLUGIN_VERSION="0.3.3" -build-arg KUBERNATOR_PLUGIN_VERSION="0.1.0" -t leto-modelizer
docker build . -build-arg TERRATOR_PLUGIN_VERSION="0.10.0" -build-arg GITHUBATOR_PLUGIN_VERSION="0.4.1" -build-arg KUBERNATOR_PLUGIN_VERSION="0.2.0" -t leto-modelizer
```

### Docker run
Expand Down
9 changes: 5 additions & 4 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Add settings button/menu to homepage and update its content.
* Add route to clear token.
* Improve dockerfile with version of plugins as argument.
* Export diagram as svg.

### Changed

Expand All @@ -33,10 +34,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Technical content:
* Update import of vue components.
* Plugin management:
* Work with [plugin-core](https://github.com/ditrit/leto-modelizer-plugin-core/tree/0.24.1) version 0.24.1.
* Work with [terrator-plugin](https://github.com/ditrit/terrator-plugin/tree/0.8.1) version 0.8.1.
* Work with [githubator-plugin](https://github.com/ditrit/githubator-plugin/tree/0.3.3) version 0.3.3.
* Work with [kubernator-plugin](https://github.com/ditrit/kubernator-plugin/tree/0.1.0) version 0.1.0.
* Work with [plugin-core](https://github.com/ditrit/leto-modelizer-plugin-core/tree/0.25.0) version 0.25.0.
* Work with [terrator-plugin](https://github.com/ditrit/terrator-plugin/tree/0.10.0) version 0.10.0.
* Work with [githubator-plugin](https://github.com/ditrit/githubator-plugin/tree/0.4.1) version 0.4.1.
* Work with [kubernator-plugin](https://github.com/ditrit/kubernator-plugin/tree/0.2.0) version 0.2.0.
* Improve performance on git add.
* Replace OIDC authentication by Leto-Modelizer-Api, see [this issue](https://github.com/ditrit/leto-modelizer/issues/425).
* Separating git-related functions into a dedicated composable.
Expand Down
12 changes: 6 additions & 6 deletions leto-modelizer-plugin-cli.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[
{
"name": "terrator-plugin",
"url": "https://github.com/ditrit/terrator-plugin.git#0.8.1",
"version": "0.8.1"
"url": "https://github.com/ditrit/terrator-plugin.git#0.10.0",
"version": "0.10.0"
},
{
"name": "githubator-plugin",
"url": "https://github.com/ditrit/githubator-plugin.git#0.3.3",
"version": "0.3.3"
"url": "https://github.com/ditrit/githubator-plugin.git#0.4.1",
"version": "0.4.1"
},
{
"name": "kubernator-plugin",
"url": "https://github.com/ditrit/kubernator-plugin.git#0.1.0",
"version": "0.1.0"
"url": "https://github.com/ditrit/kubernator-plugin.git#0.2.0",
"version": "0.2.0"
}
]
Loading

0 comments on commit 258952e

Please sign in to comment.