Skip to content

Commit

Permalink
Merge branch 'main' into release-1.1-pre
Browse files Browse the repository at this point in the history
  • Loading branch information
doebrowsk committed Apr 30, 2021
2 parents 7cb0dfb + 73cccc4 commit d98f09a
Show file tree
Hide file tree
Showing 56 changed files with 966 additions and 52 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/keyfactor-extension-generate-readme.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Update README
on: [push, workflow_dispatch]

jobs:
update_readme:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master

- uses: cuchi/jinja2-action@v1.2.0
with:
template: README.md.tpl
output_file: README.md
data_file: integration-manifest.json
env:
GITHUB_TOKEN: ${{ secrets.SDK_SYNC_PAT }}

- uses: stefanzweifel/git-auto-commit-action@v4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
push_options: '--force'
commit_message: Update generated README
commit_user_name: Keyfactor
commit_user_email: keyfactor@keyfactor.github.io
commit_author: Keyfactor <keyfactor@keyfactor.github.io>
13 changes: 8 additions & 5 deletions .github/workflows/keyfactor-extension-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,14 @@ jobs:
- name: Increment Assembly Version
run: |
$VersionRegex = "\d+\.\d+\.\d+"
$assemlyFilePath = (Get-ChildItem -Include AssemblyInfo.cs -File -Recurse).fullname
$filecontent = Get-Content($assemlyFilePath)
$newVer = "${{ steps.create_release.outputs.current_tag }}".TrimStart('v')
attrib $assemlyFilePath -r
$filecontent -replace $VersionRegex, $newVer | Out-File $assemlyFilePath
$assemblyInfoFiles = (Get-ChildItem -Include AssemblyInfo.cs -File -Recurse).fullname
foreach ($assemblyInfoFile in $assemblyInfoFiles)
{
$filecontent = Get-Content($assemblyInfoFile)
$newVer = "${{ steps.create_release.outputs.current_tag }}".TrimStart('v')
attrib $assemblyInfoFile -r
$filecontent -replace $VersionRegex, $newVer | Out-File $assemblyInfoFile
}
- name: Execute MSBuild Commands
run: |
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/keyfactor-extension-update-catalog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Generate Catalog Entry
on: [push, workflow_dispatch]

jobs:
generate_entry:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master

- uses: actions/checkout@v2
with:
token: ${{ secrets.SDK_SYNC_PAT }}
path: './catalog-temp/'
repository: 'Keyfactor/integrations-catalog'

- uses: cuchi/jinja2-action@v1.2.0
with:
template: ./catalog-temp/_integration.md.tpl
output_file: ${{ format('./catalog-temp/_integrations/{0}.md', github.event.repository.name) }}
data_file: integration-manifest.json
variables: |
repository= ${{ format('https://github.com/{0}', github.repository) }}
env:
GITHUB_TOKEN: ${{ secrets.SDK_SYNC_PAT }}

- uses: EndBug/add-and-commit@v7
with:
author_name: 'Keyfactor'
author_email: 'keyfactor@keyfactor.github.io'
branch: 'main'
message: ${{ format('Added the manifest for {0}', github.event.repository.name) }}
add: ${{ format('_integrations/{0}.md --force', github.event.repository.name) }}
cwd: './catalog-temp/'
16 changes: 15 additions & 1 deletion AnyAgent/AnyErrors.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
using System;
// Copyright 2021 Keyfactor
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
Expand Down
16 changes: 15 additions & 1 deletion AnyAgent/CertManager.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
using System;
// Copyright 2021 Keyfactor
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

using System;
using System.Collections.Generic;
using System.Configuration;
using System.IO;
Expand Down
16 changes: 15 additions & 1 deletion AnyAgent/CertStoreInfo.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
namespace DataPower
// Copyright 2021 Keyfactor
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

namespace DataPower
{
internal class CertStoreInfo
{
Expand Down
16 changes: 15 additions & 1 deletion AnyAgent/Enums.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
using System;
// Copyright 2021 Keyfactor
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
Expand Down
16 changes: 15 additions & 1 deletion AnyAgent/Inventory.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
// Release 5.1.0.0 - Runtime v4.0.30319
// Copyright 2021 Keyfactor
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// Release 5.1.0.0 - Runtime v4.0.30319
using System.Configuration;
using System.Reflection;
using CSS.Common.Logging;
Expand Down
16 changes: 15 additions & 1 deletion AnyAgent/InventoryManagement.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
using System.Configuration;
// Copyright 2021 Keyfactor
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

using System.Configuration;
using System.Reflection;
using CSS.Common.Logging;
using Keyfactor.Platform.Extensions.Agents;
Expand Down
16 changes: 15 additions & 1 deletion AnyAgent/InventoryResult.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
using System.Collections.Generic;
// Copyright 2021 Keyfactor
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

using System.Collections.Generic;
using Keyfactor.Platform.Extensions.Agents;

namespace DataPower
Expand Down
16 changes: 15 additions & 1 deletion AnyAgent/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
using System.Reflection;
// Copyright 2021 Keyfactor
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

Expand Down
15 changes: 15 additions & 0 deletions AnyAgent/app.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2021 Keyfactor
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<configuration>
<appSettings>
<!--Max Number of Certs to Inventory During the Inventory Process-->
Expand Down
16 changes: 15 additions & 1 deletion AnyAgent/utility.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
using System;
// Copyright 2021 Keyfactor
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

using System;
using DataPower.API.api;
using Keyfactor.Platform.Extensions.Agents;
using Newtonsoft.Json;
Expand Down
16 changes: 15 additions & 1 deletion DataPower.API/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
using System.Reflection;
// Copyright 2021 Keyfactor
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

Expand Down
16 changes: 15 additions & 1 deletion DataPower.API/api/CertDetailValue.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
using Newtonsoft.Json;
// Copyright 2021 Keyfactor
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

using Newtonsoft.Json;

namespace DataPower.API.api
{
Expand Down
16 changes: 15 additions & 1 deletion DataPower.API/api/CertStoreCustom.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
using Newtonsoft.Json;
// Copyright 2021 Keyfactor
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

using Newtonsoft.Json;

namespace DataPower.API.api
{
Expand Down
16 changes: 15 additions & 1 deletion DataPower.API/api/CertificateAddRequest.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
using Newtonsoft.Json;
// Copyright 2021 Keyfactor
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

using Newtonsoft.Json;

namespace DataPower.API.api
{
Expand Down
16 changes: 15 additions & 1 deletion DataPower.API/api/CertificateAddResponse.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
using Newtonsoft.Json;
// Copyright 2021 Keyfactor
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

using Newtonsoft.Json;

namespace DataPower.API.api
{
Expand Down
Loading

0 comments on commit d98f09a

Please sign in to comment.