diff --git a/sdk/dotnet/Switchcontrolleracl/Group.cs b/sdk/dotnet/Switchcontroller/Acl/Group.cs similarity index 94% rename from sdk/dotnet/Switchcontrolleracl/Group.cs rename to sdk/dotnet/Switchcontroller/Acl/Group.cs index 7b208475..e714c0c4 100644 --- a/sdk/dotnet/Switchcontrolleracl/Group.cs +++ b/sdk/dotnet/Switchcontroller/Acl/Group.cs @@ -8,7 +8,7 @@ using Pulumi.Serialization; using Pulumi; -namespace Pulumiverse.Fortios.Switchcontrolleracl +namespace Pulumiverse.Fortios.Switchcontroller.Acl { /// /// Configure ACL groups to be applied on managed FortiSwitch ports. Applies to FortiOS Version `>= 7.4.0`. @@ -18,7 +18,7 @@ namespace Pulumiverse.Fortios.Switchcontrolleracl /// SwitchControllerAcl Group can be imported using any of these accepted formats: /// /// ```sh - /// $ pulumi import fortios:switchcontrolleracl/group:Group labelname {{name}} + /// $ pulumi import fortios:switchcontroller/acl/group:Group labelname {{name}} /// ``` /// /// If you do not want to import arguments of block: @@ -26,12 +26,12 @@ namespace Pulumiverse.Fortios.Switchcontrolleracl /// $ export "FORTIOS_IMPORT_TABLE"="false" /// /// ```sh - /// $ pulumi import fortios:switchcontrolleracl/group:Group labelname {{name}} + /// $ pulumi import fortios:switchcontroller/acl/group:Group labelname {{name}} /// ``` /// /// $ unset "FORTIOS_IMPORT_TABLE" /// - [FortiosResourceType("fortios:switchcontrolleracl/group:Group")] + [FortiosResourceType("fortios:switchcontroller/acl/group:Group")] public partial class Group : global::Pulumi.CustomResource { /// @@ -73,12 +73,12 @@ public partial class Group : global::Pulumi.CustomResource /// The arguments used to populate this resource's properties /// A bag of options that control this resource's behavior public Group(string name, GroupArgs? args = null, CustomResourceOptions? options = null) - : base("fortios:switchcontrolleracl/group:Group", name, args ?? new GroupArgs(), MakeResourceOptions(options, "")) + : base("fortios:switchcontroller/acl/group:Group", name, args ?? new GroupArgs(), MakeResourceOptions(options, "")) { } private Group(string name, Input id, GroupState? state = null, CustomResourceOptions? options = null) - : base("fortios:switchcontrolleracl/group:Group", name, state, MakeResourceOptions(options, id)) + : base("fortios:switchcontroller/acl/group:Group", name, state, MakeResourceOptions(options, id)) { } diff --git a/sdk/dotnet/Switchcontrolleracl/Ingress.cs b/sdk/dotnet/Switchcontroller/Acl/Ingress.cs similarity index 93% rename from sdk/dotnet/Switchcontrolleracl/Ingress.cs rename to sdk/dotnet/Switchcontroller/Acl/Ingress.cs index 1f112d87..fb950631 100644 --- a/sdk/dotnet/Switchcontrolleracl/Ingress.cs +++ b/sdk/dotnet/Switchcontroller/Acl/Ingress.cs @@ -8,7 +8,7 @@ using Pulumi.Serialization; using Pulumi; -namespace Pulumiverse.Fortios.Switchcontrolleracl +namespace Pulumiverse.Fortios.Switchcontroller.Acl { /// /// Configure ingress ACL policies to be applied on managed FortiSwitch ports. Applies to FortiOS Version `>= 7.4.0`. @@ -18,7 +18,7 @@ namespace Pulumiverse.Fortios.Switchcontrolleracl /// SwitchControllerAcl Ingress can be imported using any of these accepted formats: /// /// ```sh - /// $ pulumi import fortios:switchcontrolleracl/ingress:Ingress labelname {{fosid}} + /// $ pulumi import fortios:switchcontroller/acl/ingress:Ingress labelname {{fosid}} /// ``` /// /// If you do not want to import arguments of block: @@ -26,12 +26,12 @@ namespace Pulumiverse.Fortios.Switchcontrolleracl /// $ export "FORTIOS_IMPORT_TABLE"="false" /// /// ```sh - /// $ pulumi import fortios:switchcontrolleracl/ingress:Ingress labelname {{fosid}} + /// $ pulumi import fortios:switchcontroller/acl/ingress:Ingress labelname {{fosid}} /// ``` /// /// $ unset "FORTIOS_IMPORT_TABLE" /// - [FortiosResourceType("fortios:switchcontrolleracl/ingress:Ingress")] + [FortiosResourceType("fortios:switchcontroller/acl/ingress:Ingress")] public partial class Ingress : global::Pulumi.CustomResource { /// @@ -79,12 +79,12 @@ public partial class Ingress : global::Pulumi.CustomResource /// The arguments used to populate this resource's properties /// A bag of options that control this resource's behavior public Ingress(string name, IngressArgs? args = null, CustomResourceOptions? options = null) - : base("fortios:switchcontrolleracl/ingress:Ingress", name, args ?? new IngressArgs(), MakeResourceOptions(options, "")) + : base("fortios:switchcontroller/acl/ingress:Ingress", name, args ?? new IngressArgs(), MakeResourceOptions(options, "")) { } private Ingress(string name, Input id, IngressState? state = null, CustomResourceOptions? options = null) - : base("fortios:switchcontrolleracl/ingress:Ingress", name, state, MakeResourceOptions(options, id)) + : base("fortios:switchcontroller/acl/ingress:Ingress", name, state, MakeResourceOptions(options, id)) { } diff --git a/sdk/dotnet/Switchcontrolleracl/Inputs/GroupIngressArgs.cs b/sdk/dotnet/Switchcontroller/Acl/Inputs/GroupIngressArgs.cs similarity index 92% rename from sdk/dotnet/Switchcontrolleracl/Inputs/GroupIngressArgs.cs rename to sdk/dotnet/Switchcontroller/Acl/Inputs/GroupIngressArgs.cs index ed57ab25..002a7708 100644 --- a/sdk/dotnet/Switchcontrolleracl/Inputs/GroupIngressArgs.cs +++ b/sdk/dotnet/Switchcontroller/Acl/Inputs/GroupIngressArgs.cs @@ -8,7 +8,7 @@ using Pulumi.Serialization; using Pulumi; -namespace Pulumiverse.Fortios.Switchcontrolleracl.Inputs +namespace Pulumiverse.Fortios.Switchcontroller.Acl.Inputs { public sealed class GroupIngressArgs : global::Pulumi.ResourceArgs diff --git a/sdk/dotnet/Switchcontrolleracl/Inputs/GroupIngressGetArgs.cs b/sdk/dotnet/Switchcontroller/Acl/Inputs/GroupIngressGetArgs.cs similarity index 92% rename from sdk/dotnet/Switchcontrolleracl/Inputs/GroupIngressGetArgs.cs rename to sdk/dotnet/Switchcontroller/Acl/Inputs/GroupIngressGetArgs.cs index 29713b50..0b4dc2ad 100644 --- a/sdk/dotnet/Switchcontrolleracl/Inputs/GroupIngressGetArgs.cs +++ b/sdk/dotnet/Switchcontroller/Acl/Inputs/GroupIngressGetArgs.cs @@ -8,7 +8,7 @@ using Pulumi.Serialization; using Pulumi; -namespace Pulumiverse.Fortios.Switchcontrolleracl.Inputs +namespace Pulumiverse.Fortios.Switchcontroller.Acl.Inputs { public sealed class GroupIngressGetArgs : global::Pulumi.ResourceArgs diff --git a/sdk/dotnet/Switchcontrolleracl/Inputs/IngressActionArgs.cs b/sdk/dotnet/Switchcontroller/Acl/Inputs/IngressActionArgs.cs similarity index 94% rename from sdk/dotnet/Switchcontrolleracl/Inputs/IngressActionArgs.cs rename to sdk/dotnet/Switchcontroller/Acl/Inputs/IngressActionArgs.cs index 0b738869..c0b577b7 100644 --- a/sdk/dotnet/Switchcontrolleracl/Inputs/IngressActionArgs.cs +++ b/sdk/dotnet/Switchcontroller/Acl/Inputs/IngressActionArgs.cs @@ -8,7 +8,7 @@ using Pulumi.Serialization; using Pulumi; -namespace Pulumiverse.Fortios.Switchcontrolleracl.Inputs +namespace Pulumiverse.Fortios.Switchcontroller.Acl.Inputs { public sealed class IngressActionArgs : global::Pulumi.ResourceArgs diff --git a/sdk/dotnet/Switchcontrolleracl/Inputs/IngressActionGetArgs.cs b/sdk/dotnet/Switchcontroller/Acl/Inputs/IngressActionGetArgs.cs similarity index 94% rename from sdk/dotnet/Switchcontrolleracl/Inputs/IngressActionGetArgs.cs rename to sdk/dotnet/Switchcontroller/Acl/Inputs/IngressActionGetArgs.cs index 9e862f0e..141dcd8c 100644 --- a/sdk/dotnet/Switchcontrolleracl/Inputs/IngressActionGetArgs.cs +++ b/sdk/dotnet/Switchcontroller/Acl/Inputs/IngressActionGetArgs.cs @@ -8,7 +8,7 @@ using Pulumi.Serialization; using Pulumi; -namespace Pulumiverse.Fortios.Switchcontrolleracl.Inputs +namespace Pulumiverse.Fortios.Switchcontroller.Acl.Inputs { public sealed class IngressActionGetArgs : global::Pulumi.ResourceArgs diff --git a/sdk/dotnet/Switchcontrolleracl/Inputs/IngressClassifierArgs.cs b/sdk/dotnet/Switchcontroller/Acl/Inputs/IngressClassifierArgs.cs similarity index 96% rename from sdk/dotnet/Switchcontrolleracl/Inputs/IngressClassifierArgs.cs rename to sdk/dotnet/Switchcontroller/Acl/Inputs/IngressClassifierArgs.cs index f298c7c4..958df925 100644 --- a/sdk/dotnet/Switchcontrolleracl/Inputs/IngressClassifierArgs.cs +++ b/sdk/dotnet/Switchcontroller/Acl/Inputs/IngressClassifierArgs.cs @@ -8,7 +8,7 @@ using Pulumi.Serialization; using Pulumi; -namespace Pulumiverse.Fortios.Switchcontrolleracl.Inputs +namespace Pulumiverse.Fortios.Switchcontroller.Acl.Inputs { public sealed class IngressClassifierArgs : global::Pulumi.ResourceArgs diff --git a/sdk/dotnet/Switchcontrolleracl/Inputs/IngressClassifierGetArgs.cs b/sdk/dotnet/Switchcontroller/Acl/Inputs/IngressClassifierGetArgs.cs similarity index 96% rename from sdk/dotnet/Switchcontrolleracl/Inputs/IngressClassifierGetArgs.cs rename to sdk/dotnet/Switchcontroller/Acl/Inputs/IngressClassifierGetArgs.cs index 9117eeb5..f10cd247 100644 --- a/sdk/dotnet/Switchcontrolleracl/Inputs/IngressClassifierGetArgs.cs +++ b/sdk/dotnet/Switchcontroller/Acl/Inputs/IngressClassifierGetArgs.cs @@ -8,7 +8,7 @@ using Pulumi.Serialization; using Pulumi; -namespace Pulumiverse.Fortios.Switchcontrolleracl.Inputs +namespace Pulumiverse.Fortios.Switchcontroller.Acl.Inputs { public sealed class IngressClassifierGetArgs : global::Pulumi.ResourceArgs diff --git a/sdk/dotnet/Switchcontrolleracl/Outputs/GroupIngress.cs b/sdk/dotnet/Switchcontroller/Acl/Outputs/GroupIngress.cs similarity index 91% rename from sdk/dotnet/Switchcontrolleracl/Outputs/GroupIngress.cs rename to sdk/dotnet/Switchcontroller/Acl/Outputs/GroupIngress.cs index 3b04bfbf..db3a1f72 100644 --- a/sdk/dotnet/Switchcontrolleracl/Outputs/GroupIngress.cs +++ b/sdk/dotnet/Switchcontroller/Acl/Outputs/GroupIngress.cs @@ -8,7 +8,7 @@ using Pulumi.Serialization; using Pulumi; -namespace Pulumiverse.Fortios.Switchcontrolleracl.Outputs +namespace Pulumiverse.Fortios.Switchcontroller.Acl.Outputs { [OutputType] diff --git a/sdk/dotnet/Switchcontrolleracl/Outputs/IngressAction.cs b/sdk/dotnet/Switchcontroller/Acl/Outputs/IngressAction.cs similarity index 93% rename from sdk/dotnet/Switchcontrolleracl/Outputs/IngressAction.cs rename to sdk/dotnet/Switchcontroller/Acl/Outputs/IngressAction.cs index 8af3ca4c..d2d5a648 100644 --- a/sdk/dotnet/Switchcontrolleracl/Outputs/IngressAction.cs +++ b/sdk/dotnet/Switchcontroller/Acl/Outputs/IngressAction.cs @@ -8,7 +8,7 @@ using Pulumi.Serialization; using Pulumi; -namespace Pulumiverse.Fortios.Switchcontrolleracl.Outputs +namespace Pulumiverse.Fortios.Switchcontroller.Acl.Outputs { [OutputType] diff --git a/sdk/dotnet/Switchcontrolleracl/Outputs/IngressClassifier.cs b/sdk/dotnet/Switchcontroller/Acl/Outputs/IngressClassifier.cs similarity index 96% rename from sdk/dotnet/Switchcontrolleracl/Outputs/IngressClassifier.cs rename to sdk/dotnet/Switchcontroller/Acl/Outputs/IngressClassifier.cs index 2a6a2f55..5586e2cc 100644 --- a/sdk/dotnet/Switchcontrolleracl/Outputs/IngressClassifier.cs +++ b/sdk/dotnet/Switchcontroller/Acl/Outputs/IngressClassifier.cs @@ -8,7 +8,7 @@ using Pulumi.Serialization; using Pulumi; -namespace Pulumiverse.Fortios.Switchcontrolleracl.Outputs +namespace Pulumiverse.Fortios.Switchcontroller.Acl.Outputs { [OutputType] diff --git a/sdk/dotnet/Switchcontrolleracl/README.md b/sdk/dotnet/Switchcontroller/Acl/README.md similarity index 100% rename from sdk/dotnet/Switchcontrolleracl/README.md rename to sdk/dotnet/Switchcontroller/Acl/README.md diff --git a/sdk/go/fortios/switchcontrolleracl/group.go b/sdk/go/fortios/switchcontroller/acl/group.go similarity index 97% rename from sdk/go/fortios/switchcontrolleracl/group.go rename to sdk/go/fortios/switchcontroller/acl/group.go index d7475ddc..a3ce03fb 100644 --- a/sdk/go/fortios/switchcontrolleracl/group.go +++ b/sdk/go/fortios/switchcontroller/acl/group.go @@ -1,7 +1,7 @@ // Code generated by the Pulumi Terraform Bridge (tfgen) Tool DO NOT EDIT. // *** WARNING: Do not edit by hand unless you're certain you know what you are doing! *** -package switchcontrolleracl +package acl import ( "context" @@ -18,7 +18,7 @@ import ( // SwitchControllerAcl Group can be imported using any of these accepted formats: // // ```sh -// $ pulumi import fortios:switchcontrolleracl/group:Group labelname {{name}} +// $ pulumi import fortios:switchcontroller/acl/group:Group labelname {{name}} // ``` // // If you do not want to import arguments of block: @@ -26,7 +26,7 @@ import ( // $ export "FORTIOS_IMPORT_TABLE"="false" // // ```sh -// $ pulumi import fortios:switchcontrolleracl/group:Group labelname {{name}} +// $ pulumi import fortios:switchcontroller/acl/group:Group labelname {{name}} // ``` // // $ unset "FORTIOS_IMPORT_TABLE" @@ -54,7 +54,7 @@ func NewGroup(ctx *pulumi.Context, opts = internal.PkgResourceDefaultOpts(opts) var resource Group - err := ctx.RegisterResource("fortios:switchcontrolleracl/group:Group", name, args, &resource, opts...) + err := ctx.RegisterResource("fortios:switchcontroller/acl/group:Group", name, args, &resource, opts...) if err != nil { return nil, err } @@ -66,7 +66,7 @@ func NewGroup(ctx *pulumi.Context, func GetGroup(ctx *pulumi.Context, name string, id pulumi.IDInput, state *GroupState, opts ...pulumi.ResourceOption) (*Group, error) { var resource Group - err := ctx.ReadResource("fortios:switchcontrolleracl/group:Group", name, id, state, &resource, opts...) + err := ctx.ReadResource("fortios:switchcontroller/acl/group:Group", name, id, state, &resource, opts...) if err != nil { return nil, err } diff --git a/sdk/go/fortios/switchcontrolleracl/ingress.go b/sdk/go/fortios/switchcontroller/acl/ingress.go similarity index 96% rename from sdk/go/fortios/switchcontrolleracl/ingress.go rename to sdk/go/fortios/switchcontroller/acl/ingress.go index 9b4315b9..e7540d0f 100644 --- a/sdk/go/fortios/switchcontrolleracl/ingress.go +++ b/sdk/go/fortios/switchcontroller/acl/ingress.go @@ -1,7 +1,7 @@ // Code generated by the Pulumi Terraform Bridge (tfgen) Tool DO NOT EDIT. // *** WARNING: Do not edit by hand unless you're certain you know what you are doing! *** -package switchcontrolleracl +package acl import ( "context" @@ -18,7 +18,7 @@ import ( // SwitchControllerAcl Ingress can be imported using any of these accepted formats: // // ```sh -// $ pulumi import fortios:switchcontrolleracl/ingress:Ingress labelname {{fosid}} +// $ pulumi import fortios:switchcontroller/acl/ingress:Ingress labelname {{fosid}} // ``` // // If you do not want to import arguments of block: @@ -26,7 +26,7 @@ import ( // $ export "FORTIOS_IMPORT_TABLE"="false" // // ```sh -// $ pulumi import fortios:switchcontrolleracl/ingress:Ingress labelname {{fosid}} +// $ pulumi import fortios:switchcontroller/acl/ingress:Ingress labelname {{fosid}} // ``` // // $ unset "FORTIOS_IMPORT_TABLE" @@ -56,7 +56,7 @@ func NewIngress(ctx *pulumi.Context, opts = internal.PkgResourceDefaultOpts(opts) var resource Ingress - err := ctx.RegisterResource("fortios:switchcontrolleracl/ingress:Ingress", name, args, &resource, opts...) + err := ctx.RegisterResource("fortios:switchcontroller/acl/ingress:Ingress", name, args, &resource, opts...) if err != nil { return nil, err } @@ -68,7 +68,7 @@ func NewIngress(ctx *pulumi.Context, func GetIngress(ctx *pulumi.Context, name string, id pulumi.IDInput, state *IngressState, opts ...pulumi.ResourceOption) (*Ingress, error) { var resource Ingress - err := ctx.ReadResource("fortios:switchcontrolleracl/ingress:Ingress", name, id, state, &resource, opts...) + err := ctx.ReadResource("fortios:switchcontroller/acl/ingress:Ingress", name, id, state, &resource, opts...) if err != nil { return nil, err } diff --git a/sdk/go/fortios/switchcontrolleracl/init.go b/sdk/go/fortios/switchcontroller/acl/init.go similarity index 83% rename from sdk/go/fortios/switchcontrolleracl/init.go rename to sdk/go/fortios/switchcontroller/acl/init.go index dc372666..c45a5edb 100644 --- a/sdk/go/fortios/switchcontrolleracl/init.go +++ b/sdk/go/fortios/switchcontroller/acl/init.go @@ -1,7 +1,7 @@ // Code generated by the Pulumi Terraform Bridge (tfgen) Tool DO NOT EDIT. // *** WARNING: Do not edit by hand unless you're certain you know what you are doing! *** -package switchcontrolleracl +package acl import ( "fmt" @@ -21,9 +21,9 @@ func (m *module) Version() semver.Version { func (m *module) Construct(ctx *pulumi.Context, name, typ, urn string) (r pulumi.Resource, err error) { switch typ { - case "fortios:switchcontrolleracl/group:Group": + case "fortios:switchcontroller/acl/group:Group": r = &Group{} - case "fortios:switchcontrolleracl/ingress:Ingress": + case "fortios:switchcontroller/acl/ingress:Ingress": r = &Ingress{} default: return nil, fmt.Errorf("unknown resource type: %s", typ) @@ -40,12 +40,12 @@ func init() { } pulumi.RegisterResourceModule( "fortios", - "switchcontrolleracl/group", + "switchcontroller/acl/group", &module{version}, ) pulumi.RegisterResourceModule( "fortios", - "switchcontrolleracl/ingress", + "switchcontroller/acl/ingress", &module{version}, ) } diff --git a/sdk/go/fortios/switchcontrolleracl/pulumiTypes.go b/sdk/go/fortios/switchcontroller/acl/pulumiTypes.go similarity index 99% rename from sdk/go/fortios/switchcontrolleracl/pulumiTypes.go rename to sdk/go/fortios/switchcontroller/acl/pulumiTypes.go index 1fd8ff1d..fb339e39 100644 --- a/sdk/go/fortios/switchcontrolleracl/pulumiTypes.go +++ b/sdk/go/fortios/switchcontroller/acl/pulumiTypes.go @@ -1,7 +1,7 @@ // Code generated by the Pulumi Terraform Bridge (tfgen) Tool DO NOT EDIT. // *** WARNING: Do not edit by hand unless you're certain you know what you are doing! *** -package switchcontrolleracl +package acl import ( "context" diff --git a/sdk/nodejs/index.ts b/sdk/nodejs/index.ts index cc7055af..8178da1d 100644 --- a/sdk/nodejs/index.ts +++ b/sdk/nodejs/index.ts @@ -43,7 +43,6 @@ import * as report from "./report"; import * as router from "./router"; import * as rule from "./rule"; import * as switchcontroller from "./switchcontroller"; -import * as switchcontrolleracl from "./switchcontrolleracl"; import * as system from "./system"; import * as types from "./types"; import * as user from "./user"; @@ -87,7 +86,6 @@ export { router, rule, switchcontroller, - switchcontrolleracl, system, types, user, diff --git a/sdk/nodejs/switchcontrolleracl/group.ts b/sdk/nodejs/switchcontroller/acl/group.ts similarity index 95% rename from sdk/nodejs/switchcontrolleracl/group.ts rename to sdk/nodejs/switchcontroller/acl/group.ts index 72811767..fc945645 100644 --- a/sdk/nodejs/switchcontrolleracl/group.ts +++ b/sdk/nodejs/switchcontroller/acl/group.ts @@ -2,9 +2,9 @@ // *** Do not edit by hand unless you're certain you know what you are doing! *** import * as pulumi from "@pulumi/pulumi"; -import * as inputs from "../types/input"; -import * as outputs from "../types/output"; -import * as utilities from "../utilities"; +import * as inputs from "../../types/input"; +import * as outputs from "../../types/output"; +import * as utilities from "../../utilities"; /** * Configure ACL groups to be applied on managed FortiSwitch ports. Applies to FortiOS Version `>= 7.4.0`. @@ -14,7 +14,7 @@ import * as utilities from "../utilities"; * SwitchControllerAcl Group can be imported using any of these accepted formats: * * ```sh - * $ pulumi import fortios:switchcontrolleracl/group:Group labelname {{name}} + * $ pulumi import fortios:switchcontroller/acl/group:Group labelname {{name}} * ``` * * If you do not want to import arguments of block: @@ -22,7 +22,7 @@ import * as utilities from "../utilities"; * $ export "FORTIOS_IMPORT_TABLE"="false" * * ```sh - * $ pulumi import fortios:switchcontrolleracl/group:Group labelname {{name}} + * $ pulumi import fortios:switchcontroller/acl/group:Group labelname {{name}} * ``` * * $ unset "FORTIOS_IMPORT_TABLE" @@ -42,7 +42,7 @@ export class Group extends pulumi.CustomResource { } /** @internal */ - public static readonly __pulumiType = 'fortios:switchcontrolleracl/group:Group'; + public static readonly __pulumiType = 'fortios:switchcontroller/acl/group:Group'; /** * Returns true if the given object is an instance of Group. This is designed to work even @@ -66,7 +66,7 @@ export class Group extends pulumi.CustomResource { /** * Configure ingress ACL policies in group. The structure of `ingress` block is documented below. */ - public readonly ingresses!: pulumi.Output; + public readonly ingresses!: pulumi.Output; /** * Group name. */ @@ -122,7 +122,7 @@ export interface GroupState { /** * Configure ingress ACL policies in group. The structure of `ingress` block is documented below. */ - ingresses?: pulumi.Input[]>; + ingresses?: pulumi.Input[]>; /** * Group name. */ @@ -148,7 +148,7 @@ export interface GroupArgs { /** * Configure ingress ACL policies in group. The structure of `ingress` block is documented below. */ - ingresses?: pulumi.Input[]>; + ingresses?: pulumi.Input[]>; /** * Group name. */ diff --git a/sdk/nodejs/switchcontrolleracl/index.ts b/sdk/nodejs/switchcontroller/acl/index.ts similarity index 84% rename from sdk/nodejs/switchcontrolleracl/index.ts rename to sdk/nodejs/switchcontroller/acl/index.ts index 43448a30..13161cae 100644 --- a/sdk/nodejs/switchcontrolleracl/index.ts +++ b/sdk/nodejs/switchcontroller/acl/index.ts @@ -2,7 +2,7 @@ // *** Do not edit by hand unless you're certain you know what you are doing! *** import * as pulumi from "@pulumi/pulumi"; -import * as utilities from "../utilities"; +import * as utilities from "../../utilities"; // Export members: export { GroupArgs, GroupState } from "./group"; @@ -20,14 +20,14 @@ const _module = { version: utilities.getVersion(), construct: (name: string, type: string, urn: string): pulumi.Resource => { switch (type) { - case "fortios:switchcontrolleracl/group:Group": + case "fortios:switchcontroller/acl/group:Group": return new Group(name, undefined, { urn }) - case "fortios:switchcontrolleracl/ingress:Ingress": + case "fortios:switchcontroller/acl/ingress:Ingress": return new Ingress(name, undefined, { urn }) default: throw new Error(`unknown resource type ${type}`); } }, }; -pulumi.runtime.registerResourceModule("fortios", "switchcontrolleracl/group", _module) -pulumi.runtime.registerResourceModule("fortios", "switchcontrolleracl/ingress", _module) +pulumi.runtime.registerResourceModule("fortios", "switchcontroller/acl/group", _module) +pulumi.runtime.registerResourceModule("fortios", "switchcontroller/acl/ingress", _module) diff --git a/sdk/nodejs/switchcontrolleracl/ingress.ts b/sdk/nodejs/switchcontroller/acl/ingress.ts similarity index 91% rename from sdk/nodejs/switchcontrolleracl/ingress.ts rename to sdk/nodejs/switchcontroller/acl/ingress.ts index 179a6641..e59ba364 100644 --- a/sdk/nodejs/switchcontrolleracl/ingress.ts +++ b/sdk/nodejs/switchcontroller/acl/ingress.ts @@ -2,9 +2,9 @@ // *** Do not edit by hand unless you're certain you know what you are doing! *** import * as pulumi from "@pulumi/pulumi"; -import * as inputs from "../types/input"; -import * as outputs from "../types/output"; -import * as utilities from "../utilities"; +import * as inputs from "../../types/input"; +import * as outputs from "../../types/output"; +import * as utilities from "../../utilities"; /** * Configure ingress ACL policies to be applied on managed FortiSwitch ports. Applies to FortiOS Version `>= 7.4.0`. @@ -14,7 +14,7 @@ import * as utilities from "../utilities"; * SwitchControllerAcl Ingress can be imported using any of these accepted formats: * * ```sh - * $ pulumi import fortios:switchcontrolleracl/ingress:Ingress labelname {{fosid}} + * $ pulumi import fortios:switchcontroller/acl/ingress:Ingress labelname {{fosid}} * ``` * * If you do not want to import arguments of block: @@ -22,7 +22,7 @@ import * as utilities from "../utilities"; * $ export "FORTIOS_IMPORT_TABLE"="false" * * ```sh - * $ pulumi import fortios:switchcontrolleracl/ingress:Ingress labelname {{fosid}} + * $ pulumi import fortios:switchcontroller/acl/ingress:Ingress labelname {{fosid}} * ``` * * $ unset "FORTIOS_IMPORT_TABLE" @@ -42,7 +42,7 @@ export class Ingress extends pulumi.CustomResource { } /** @internal */ - public static readonly __pulumiType = 'fortios:switchcontrolleracl/ingress:Ingress'; + public static readonly __pulumiType = 'fortios:switchcontroller/acl/ingress:Ingress'; /** * Returns true if the given object is an instance of Ingress. This is designed to work even @@ -58,11 +58,11 @@ export class Ingress extends pulumi.CustomResource { /** * ACL actions. The structure of `action` block is documented below. */ - public readonly action!: pulumi.Output; + public readonly action!: pulumi.Output; /** * ACL classifiers. The structure of `classifier` block is documented below. */ - public readonly classifier!: pulumi.Output; + public readonly classifier!: pulumi.Output; /** * Description for the ACL policy. */ @@ -120,11 +120,11 @@ export interface IngressState { /** * ACL actions. The structure of `action` block is documented below. */ - action?: pulumi.Input; + action?: pulumi.Input; /** * ACL classifiers. The structure of `classifier` block is documented below. */ - classifier?: pulumi.Input; + classifier?: pulumi.Input; /** * Description for the ACL policy. */ @@ -150,11 +150,11 @@ export interface IngressArgs { /** * ACL actions. The structure of `action` block is documented below. */ - action?: pulumi.Input; + action?: pulumi.Input; /** * ACL classifiers. The structure of `classifier` block is documented below. */ - classifier?: pulumi.Input; + classifier?: pulumi.Input; /** * Description for the ACL policy. */ diff --git a/sdk/nodejs/switchcontroller/index.ts b/sdk/nodejs/switchcontroller/index.ts index bae8a35e..336bf5ab 100644 --- a/sdk/nodejs/switchcontroller/index.ts +++ b/sdk/nodejs/switchcontroller/index.ts @@ -192,6 +192,7 @@ utilities.lazyLoad(exports, ["Vlanpolicy"], () => require("./vlanpolicy")); // Export sub-modules: +import * as acl from "./acl"; import * as autoconfig from "./autoconfig"; import * as initialconfig from "./initialconfig"; import * as ptp from "./ptp"; @@ -199,6 +200,7 @@ import * as qos from "./qos"; import * as securitypolicy from "./securitypolicy"; export { + acl, autoconfig, initialconfig, ptp, diff --git a/sdk/nodejs/tsconfig.json b/sdk/nodejs/tsconfig.json index 43d9893a..43982dce 100644 --- a/sdk/nodejs/tsconfig.json +++ b/sdk/nodejs/tsconfig.json @@ -540,6 +540,9 @@ "rule/index.ts", "rule/otdt.ts", "rule/otvp.ts", + "switchcontroller/acl/group.ts", + "switchcontroller/acl/index.ts", + "switchcontroller/acl/ingress.ts", "switchcontroller/autoconfig/custom.ts", "switchcontroller/autoconfig/default.ts", "switchcontroller/autoconfig/index.ts", @@ -599,9 +602,6 @@ "switchcontroller/virtualportpool.ts", "switchcontroller/vlan.ts", "switchcontroller/vlanpolicy.ts", - "switchcontrolleracl/group.ts", - "switchcontrolleracl/index.ts", - "switchcontrolleracl/ingress.ts", "system/accprofile.ts", "system/acme.ts", "system/admin.ts", diff --git a/sdk/nodejs/types/input.ts b/sdk/nodejs/types/input.ts index d5814360..c0bf1594 100644 --- a/sdk/nodejs/types/input.ts +++ b/sdk/nodejs/types/input.ts @@ -16530,6 +16530,49 @@ export namespace switchcontroller { */ vlanName?: pulumi.Input; } + export namespace acl { + export interface GroupIngress { + /** + * ACL ID. + */ + id?: pulumi.Input; + } + + export interface IngressAction { + /** + * Enable/disable count. Valid values: `enable`, `disable`. + */ + count?: pulumi.Input; + /** + * Enable/disable drop. Valid values: `enable`, `disable`. + */ + drop?: pulumi.Input; + } + + export interface IngressClassifier { + /** + * Destination IP address to be matched. + */ + dstIpPrefix?: pulumi.Input; + /** + * Destination MAC address to be matched. + */ + dstMac?: pulumi.Input; + /** + * Source IP address to be matched. + */ + srcIpPrefix?: pulumi.Input; + /** + * Source MAC address to be matched. + */ + srcMac?: pulumi.Input; + /** + * VLAN ID to be matched. + */ + vlan?: pulumi.Input; + } + } + export namespace autoconfig { export interface CustomSwitchBinding { /** @@ -16617,49 +16660,6 @@ export namespace switchcontroller { } } -export namespace switchcontrolleracl { - export interface GroupIngress { - /** - * ACL ID. - */ - id?: pulumi.Input; - } - - export interface IngressAction { - /** - * Enable/disable count. Valid values: `enable`, `disable`. - */ - count?: pulumi.Input; - /** - * Enable/disable drop. Valid values: `enable`, `disable`. - */ - drop?: pulumi.Input; - } - - export interface IngressClassifier { - /** - * Destination IP address to be matched. - */ - dstIpPrefix?: pulumi.Input; - /** - * Destination MAC address to be matched. - */ - dstMac?: pulumi.Input; - /** - * Source IP address to be matched. - */ - srcIpPrefix?: pulumi.Input; - /** - * Source MAC address to be matched. - */ - srcMac?: pulumi.Input; - /** - * VLAN ID to be matched. - */ - vlan?: pulumi.Input; - } -} - export namespace system { export interface AccprofileFwgrpPermission { /** diff --git a/sdk/nodejs/types/output.ts b/sdk/nodejs/types/output.ts index 2015d7fb..822be1ad 100644 --- a/sdk/nodejs/types/output.ts +++ b/sdk/nodejs/types/output.ts @@ -22533,6 +22533,50 @@ export namespace switchcontroller { vlanName: string; } + export namespace acl { + export interface GroupIngress { + /** + * ACL ID. + */ + id: number; + } + + export interface IngressAction { + /** + * Enable/disable count. Valid values: `enable`, `disable`. + */ + count: string; + /** + * Enable/disable drop. Valid values: `enable`, `disable`. + */ + drop: string; + } + + export interface IngressClassifier { + /** + * Destination IP address to be matched. + */ + dstIpPrefix: string; + /** + * Destination MAC address to be matched. + */ + dstMac: string; + /** + * Source IP address to be matched. + */ + srcIpPrefix: string; + /** + * Source MAC address to be matched. + */ + srcMac: string; + /** + * VLAN ID to be matched. + */ + vlan: number; + } + + } + export namespace autoconfig { export interface CustomSwitchBinding { /** @@ -22623,50 +22667,6 @@ export namespace switchcontroller { } } -export namespace switchcontrolleracl { - export interface GroupIngress { - /** - * ACL ID. - */ - id: number; - } - - export interface IngressAction { - /** - * Enable/disable count. Valid values: `enable`, `disable`. - */ - count: string; - /** - * Enable/disable drop. Valid values: `enable`, `disable`. - */ - drop: string; - } - - export interface IngressClassifier { - /** - * Destination IP address to be matched. - */ - dstIpPrefix: string; - /** - * Destination MAC address to be matched. - */ - dstMac: string; - /** - * Source IP address to be matched. - */ - srcIpPrefix: string; - /** - * Source MAC address to be matched. - */ - srcMac: string; - /** - * VLAN ID to be matched. - */ - vlan: number; - } - -} - export namespace system { export interface AccprofileFwgrpPermission { /** diff --git a/sdk/python/pulumiverse_fortios/__init__.py b/sdk/python/pulumiverse_fortios/__init__.py index 56a18cfc..d98b3817 100644 --- a/sdk/python/pulumiverse_fortios/__init__.py +++ b/sdk/python/pulumiverse_fortios/__init__.py @@ -71,8 +71,6 @@ rule = __rule import pulumiverse_fortios.switchcontroller as __switchcontroller switchcontroller = __switchcontroller - import pulumiverse_fortios.switchcontrolleracl as __switchcontrolleracl - switchcontrolleracl = __switchcontrolleracl import pulumiverse_fortios.system as __system system = __system import pulumiverse_fortios.user as __user @@ -123,7 +121,6 @@ router = _utilities.lazy_import('pulumiverse_fortios.router') rule = _utilities.lazy_import('pulumiverse_fortios.rule') switchcontroller = _utilities.lazy_import('pulumiverse_fortios.switchcontroller') - switchcontrolleracl = _utilities.lazy_import('pulumiverse_fortios.switchcontrolleracl') system = _utilities.lazy_import('pulumiverse_fortios.system') user = _utilities.lazy_import('pulumiverse_fortios.user') virtualpatch = _utilities.lazy_import('pulumiverse_fortios.virtualpatch') @@ -2897,6 +2894,22 @@ "fortios:rule/otvp:Otvp": "Otvp" } }, + { + "pkg": "fortios", + "mod": "switchcontroller/acl/group", + "fqn": "pulumiverse_fortios.switchcontroller.acl", + "classes": { + "fortios:switchcontroller/acl/group:Group": "Group" + } + }, + { + "pkg": "fortios", + "mod": "switchcontroller/acl/ingress", + "fqn": "pulumiverse_fortios.switchcontroller.acl", + "classes": { + "fortios:switchcontroller/acl/ingress:Ingress": "Ingress" + } + }, { "pkg": "fortios", "mod": "switchcontroller/autoconfig/custom", @@ -3321,22 +3334,6 @@ "fortios:switchcontroller/vlanpolicy:Vlanpolicy": "Vlanpolicy" } }, - { - "pkg": "fortios", - "mod": "switchcontrolleracl/group", - "fqn": "pulumiverse_fortios.switchcontrolleracl", - "classes": { - "fortios:switchcontrolleracl/group:Group": "Group" - } - }, - { - "pkg": "fortios", - "mod": "switchcontrolleracl/ingress", - "fqn": "pulumiverse_fortios.switchcontrolleracl", - "classes": { - "fortios:switchcontrolleracl/ingress:Ingress": "Ingress" - } - }, { "pkg": "fortios", "mod": "system/accprofile", diff --git a/sdk/python/pulumiverse_fortios/firewall/security_policysort.py b/sdk/python/pulumiverse_fortios/firewall/security_policysort.py deleted file mode 100644 index 8a4b4e55..00000000 --- a/sdk/python/pulumiverse_fortios/firewall/security_policysort.py +++ /dev/null @@ -1,408 +0,0 @@ -# coding=utf-8 -# *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. *** -# *** Do not edit by hand unless you're certain you know what you are doing! *** - -import copy -import warnings -import pulumi -import pulumi.runtime -from typing import Any, Mapping, Optional, Sequence, Union, overload -from .. import _utilities -from . import outputs -from ._inputs import * - -__all__ = ['SecurityPolicysortArgs', 'SecurityPolicysort'] - -@pulumi.input_type -class SecurityPolicysortArgs: - def __init__(__self__, *, - sortby: pulumi.Input[str], - sortdirection: pulumi.Input[str], - comment: Optional[pulumi.Input[str]] = None, - force_recreate: Optional[pulumi.Input[str]] = None, - status: Optional[pulumi.Input[str]] = None, - vdomparam: Optional[pulumi.Input[str]] = None): - """ - The set of arguments for constructing a SecurityPolicysort resource. - :param pulumi.Input[str] sortby: Sort security policies by the value, it currently supports "policyid" and "name". - :param pulumi.Input[str] sortdirection: Sort dirction, supports "ascending" and "descending". - :param pulumi.Input[str] comment: Comment. - :param pulumi.Input[str] force_recreate: The argument is optional, if it is set, when the value changes, the resource will be re-created. It is usually used when new policies are added, or old policies are deleted, or when the policy name is changed when `sortby` is set to `name`, see Example2. - """ - pulumi.set(__self__, "sortby", sortby) - pulumi.set(__self__, "sortdirection", sortdirection) - if comment is not None: - pulumi.set(__self__, "comment", comment) - if force_recreate is not None: - pulumi.set(__self__, "force_recreate", force_recreate) - if status is not None: - pulumi.set(__self__, "status", status) - if vdomparam is not None: - pulumi.set(__self__, "vdomparam", vdomparam) - - @property - @pulumi.getter - def sortby(self) -> pulumi.Input[str]: - """ - Sort security policies by the value, it currently supports "policyid" and "name". - """ - return pulumi.get(self, "sortby") - - @sortby.setter - def sortby(self, value: pulumi.Input[str]): - pulumi.set(self, "sortby", value) - - @property - @pulumi.getter - def sortdirection(self) -> pulumi.Input[str]: - """ - Sort dirction, supports "ascending" and "descending". - """ - return pulumi.get(self, "sortdirection") - - @sortdirection.setter - def sortdirection(self, value: pulumi.Input[str]): - pulumi.set(self, "sortdirection", value) - - @property - @pulumi.getter - def comment(self) -> Optional[pulumi.Input[str]]: - """ - Comment. - """ - return pulumi.get(self, "comment") - - @comment.setter - def comment(self, value: Optional[pulumi.Input[str]]): - pulumi.set(self, "comment", value) - - @property - @pulumi.getter(name="forceRecreate") - def force_recreate(self) -> Optional[pulumi.Input[str]]: - """ - The argument is optional, if it is set, when the value changes, the resource will be re-created. It is usually used when new policies are added, or old policies are deleted, or when the policy name is changed when `sortby` is set to `name`, see Example2. - """ - return pulumi.get(self, "force_recreate") - - @force_recreate.setter - def force_recreate(self, value: Optional[pulumi.Input[str]]): - pulumi.set(self, "force_recreate", value) - - @property - @pulumi.getter - def status(self) -> Optional[pulumi.Input[str]]: - return pulumi.get(self, "status") - - @status.setter - def status(self, value: Optional[pulumi.Input[str]]): - pulumi.set(self, "status", value) - - @property - @pulumi.getter - def vdomparam(self) -> Optional[pulumi.Input[str]]: - return pulumi.get(self, "vdomparam") - - @vdomparam.setter - def vdomparam(self, value: Optional[pulumi.Input[str]]): - pulumi.set(self, "vdomparam", value) - - -@pulumi.input_type -class _SecurityPolicysortState: - def __init__(__self__, *, - comment: Optional[pulumi.Input[str]] = None, - force_recreate: Optional[pulumi.Input[str]] = None, - sortby: Optional[pulumi.Input[str]] = None, - sortdirection: Optional[pulumi.Input[str]] = None, - state_policy_lists: Optional[pulumi.Input[Sequence[pulumi.Input['SecurityPolicysortStatePolicyListArgs']]]] = None, - status: Optional[pulumi.Input[str]] = None, - vdomparam: Optional[pulumi.Input[str]] = None): - """ - Input properties used for looking up and filtering SecurityPolicysort resources. - :param pulumi.Input[str] comment: Comment. - :param pulumi.Input[str] force_recreate: The argument is optional, if it is set, when the value changes, the resource will be re-created. It is usually used when new policies are added, or old policies are deleted, or when the policy name is changed when `sortby` is set to `name`, see Example2. - :param pulumi.Input[str] sortby: Sort security policies by the value, it currently supports "policyid" and "name". - :param pulumi.Input[str] sortdirection: Sort dirction, supports "ascending" and "descending". - """ - if comment is not None: - pulumi.set(__self__, "comment", comment) - if force_recreate is not None: - pulumi.set(__self__, "force_recreate", force_recreate) - if sortby is not None: - pulumi.set(__self__, "sortby", sortby) - if sortdirection is not None: - pulumi.set(__self__, "sortdirection", sortdirection) - if state_policy_lists is not None: - pulumi.set(__self__, "state_policy_lists", state_policy_lists) - if status is not None: - pulumi.set(__self__, "status", status) - if vdomparam is not None: - pulumi.set(__self__, "vdomparam", vdomparam) - - @property - @pulumi.getter - def comment(self) -> Optional[pulumi.Input[str]]: - """ - Comment. - """ - return pulumi.get(self, "comment") - - @comment.setter - def comment(self, value: Optional[pulumi.Input[str]]): - pulumi.set(self, "comment", value) - - @property - @pulumi.getter(name="forceRecreate") - def force_recreate(self) -> Optional[pulumi.Input[str]]: - """ - The argument is optional, if it is set, when the value changes, the resource will be re-created. It is usually used when new policies are added, or old policies are deleted, or when the policy name is changed when `sortby` is set to `name`, see Example2. - """ - return pulumi.get(self, "force_recreate") - - @force_recreate.setter - def force_recreate(self, value: Optional[pulumi.Input[str]]): - pulumi.set(self, "force_recreate", value) - - @property - @pulumi.getter - def sortby(self) -> Optional[pulumi.Input[str]]: - """ - Sort security policies by the value, it currently supports "policyid" and "name". - """ - return pulumi.get(self, "sortby") - - @sortby.setter - def sortby(self, value: Optional[pulumi.Input[str]]): - pulumi.set(self, "sortby", value) - - @property - @pulumi.getter - def sortdirection(self) -> Optional[pulumi.Input[str]]: - """ - Sort dirction, supports "ascending" and "descending". - """ - return pulumi.get(self, "sortdirection") - - @sortdirection.setter - def sortdirection(self, value: Optional[pulumi.Input[str]]): - pulumi.set(self, "sortdirection", value) - - @property - @pulumi.getter(name="statePolicyLists") - def state_policy_lists(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['SecurityPolicysortStatePolicyListArgs']]]]: - return pulumi.get(self, "state_policy_lists") - - @state_policy_lists.setter - def state_policy_lists(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['SecurityPolicysortStatePolicyListArgs']]]]): - pulumi.set(self, "state_policy_lists", value) - - @property - @pulumi.getter - def status(self) -> Optional[pulumi.Input[str]]: - return pulumi.get(self, "status") - - @status.setter - def status(self, value: Optional[pulumi.Input[str]]): - pulumi.set(self, "status", value) - - @property - @pulumi.getter - def vdomparam(self) -> Optional[pulumi.Input[str]]: - return pulumi.get(self, "vdomparam") - - @vdomparam.setter - def vdomparam(self, value: Optional[pulumi.Input[str]]): - pulumi.set(self, "vdomparam", value) - - -class SecurityPolicysort(pulumi.CustomResource): - @overload - def __init__(__self__, - resource_name: str, - opts: Optional[pulumi.ResourceOptions] = None, - comment: Optional[pulumi.Input[str]] = None, - force_recreate: Optional[pulumi.Input[str]] = None, - sortby: Optional[pulumi.Input[str]] = None, - sortdirection: Optional[pulumi.Input[str]] = None, - status: Optional[pulumi.Input[str]] = None, - vdomparam: Optional[pulumi.Input[str]] = None, - __props__=None): - """ - Resource to sort firewall security policies by policyid or policy name, in ascending or descending order. - - ## Example Usage - - ### Example1 - - ```python - import pulumi - import pulumiverse_fortios as fortios - - test = fortios.firewall.SecurityPolicysort("test", - sortby="policyid", - sortdirection="descending") - pulumi.export("policylistAfterApply", test.state_policy_lists) - ``` - - - :param str resource_name: The name of the resource. - :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[str] comment: Comment. - :param pulumi.Input[str] force_recreate: The argument is optional, if it is set, when the value changes, the resource will be re-created. It is usually used when new policies are added, or old policies are deleted, or when the policy name is changed when `sortby` is set to `name`, see Example2. - :param pulumi.Input[str] sortby: Sort security policies by the value, it currently supports "policyid" and "name". - :param pulumi.Input[str] sortdirection: Sort dirction, supports "ascending" and "descending". - """ - ... - @overload - def __init__(__self__, - resource_name: str, - args: SecurityPolicysortArgs, - opts: Optional[pulumi.ResourceOptions] = None): - """ - Resource to sort firewall security policies by policyid or policy name, in ascending or descending order. - - ## Example Usage - - ### Example1 - - ```python - import pulumi - import pulumiverse_fortios as fortios - - test = fortios.firewall.SecurityPolicysort("test", - sortby="policyid", - sortdirection="descending") - pulumi.export("policylistAfterApply", test.state_policy_lists) - ``` - - - :param str resource_name: The name of the resource. - :param SecurityPolicysortArgs args: The arguments to use to populate this resource's properties. - :param pulumi.ResourceOptions opts: Options for the resource. - """ - ... - def __init__(__self__, resource_name: str, *args, **kwargs): - resource_args, opts = _utilities.get_resource_args_opts(SecurityPolicysortArgs, pulumi.ResourceOptions, *args, **kwargs) - if resource_args is not None: - __self__._internal_init(resource_name, opts, **resource_args.__dict__) - else: - __self__._internal_init(resource_name, *args, **kwargs) - - def _internal_init(__self__, - resource_name: str, - opts: Optional[pulumi.ResourceOptions] = None, - comment: Optional[pulumi.Input[str]] = None, - force_recreate: Optional[pulumi.Input[str]] = None, - sortby: Optional[pulumi.Input[str]] = None, - sortdirection: Optional[pulumi.Input[str]] = None, - status: Optional[pulumi.Input[str]] = None, - vdomparam: Optional[pulumi.Input[str]] = None, - __props__=None): - opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts) - if not isinstance(opts, pulumi.ResourceOptions): - raise TypeError('Expected resource options to be a ResourceOptions instance') - if opts.id is None: - if __props__ is not None: - raise TypeError('__props__ is only valid when passed in combination with a valid opts.id to get an existing resource') - __props__ = SecurityPolicysortArgs.__new__(SecurityPolicysortArgs) - - __props__.__dict__["comment"] = comment - __props__.__dict__["force_recreate"] = force_recreate - if sortby is None and not opts.urn: - raise TypeError("Missing required property 'sortby'") - __props__.__dict__["sortby"] = sortby - if sortdirection is None and not opts.urn: - raise TypeError("Missing required property 'sortdirection'") - __props__.__dict__["sortdirection"] = sortdirection - __props__.__dict__["status"] = status - __props__.__dict__["vdomparam"] = vdomparam - __props__.__dict__["state_policy_lists"] = None - super(SecurityPolicysort, __self__).__init__( - 'fortios:firewall/securityPolicysort:SecurityPolicysort', - resource_name, - __props__, - opts) - - @staticmethod - def get(resource_name: str, - id: pulumi.Input[str], - opts: Optional[pulumi.ResourceOptions] = None, - comment: Optional[pulumi.Input[str]] = None, - force_recreate: Optional[pulumi.Input[str]] = None, - sortby: Optional[pulumi.Input[str]] = None, - sortdirection: Optional[pulumi.Input[str]] = None, - state_policy_lists: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['SecurityPolicysortStatePolicyListArgs']]]]] = None, - status: Optional[pulumi.Input[str]] = None, - vdomparam: Optional[pulumi.Input[str]] = None) -> 'SecurityPolicysort': - """ - Get an existing SecurityPolicysort resource's state with the given name, id, and optional extra - properties used to qualify the lookup. - - :param str resource_name: The unique name of the resulting resource. - :param pulumi.Input[str] id: The unique provider ID of the resource to lookup. - :param pulumi.ResourceOptions opts: Options for the resource. - :param pulumi.Input[str] comment: Comment. - :param pulumi.Input[str] force_recreate: The argument is optional, if it is set, when the value changes, the resource will be re-created. It is usually used when new policies are added, or old policies are deleted, or when the policy name is changed when `sortby` is set to `name`, see Example2. - :param pulumi.Input[str] sortby: Sort security policies by the value, it currently supports "policyid" and "name". - :param pulumi.Input[str] sortdirection: Sort dirction, supports "ascending" and "descending". - """ - opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id)) - - __props__ = _SecurityPolicysortState.__new__(_SecurityPolicysortState) - - __props__.__dict__["comment"] = comment - __props__.__dict__["force_recreate"] = force_recreate - __props__.__dict__["sortby"] = sortby - __props__.__dict__["sortdirection"] = sortdirection - __props__.__dict__["state_policy_lists"] = state_policy_lists - __props__.__dict__["status"] = status - __props__.__dict__["vdomparam"] = vdomparam - return SecurityPolicysort(resource_name, opts=opts, __props__=__props__) - - @property - @pulumi.getter - def comment(self) -> pulumi.Output[Optional[str]]: - """ - Comment. - """ - return pulumi.get(self, "comment") - - @property - @pulumi.getter(name="forceRecreate") - def force_recreate(self) -> pulumi.Output[Optional[str]]: - """ - The argument is optional, if it is set, when the value changes, the resource will be re-created. It is usually used when new policies are added, or old policies are deleted, or when the policy name is changed when `sortby` is set to `name`, see Example2. - """ - return pulumi.get(self, "force_recreate") - - @property - @pulumi.getter - def sortby(self) -> pulumi.Output[str]: - """ - Sort security policies by the value, it currently supports "policyid" and "name". - """ - return pulumi.get(self, "sortby") - - @property - @pulumi.getter - def sortdirection(self) -> pulumi.Output[str]: - """ - Sort dirction, supports "ascending" and "descending". - """ - return pulumi.get(self, "sortdirection") - - @property - @pulumi.getter(name="statePolicyLists") - def state_policy_lists(self) -> pulumi.Output[Sequence['outputs.SecurityPolicysortStatePolicyList']]: - return pulumi.get(self, "state_policy_lists") - - @property - @pulumi.getter - def status(self) -> pulumi.Output[Optional[str]]: - return pulumi.get(self, "status") - - @property - @pulumi.getter - def vdomparam(self) -> pulumi.Output[Optional[str]]: - return pulumi.get(self, "vdomparam") - diff --git a/sdk/python/pulumiverse_fortios/switchcontroller/__init__.py b/sdk/python/pulumiverse_fortios/switchcontroller/__init__.py index 183c9378..714287bf 100644 --- a/sdk/python/pulumiverse_fortios/switchcontroller/__init__.py +++ b/sdk/python/pulumiverse_fortios/switchcontroller/__init__.py @@ -47,6 +47,8 @@ # Make subpackages available: if typing.TYPE_CHECKING: + import pulumiverse_fortios.switchcontroller.acl as __acl + acl = __acl import pulumiverse_fortios.switchcontroller.autoconfig as __autoconfig autoconfig = __autoconfig import pulumiverse_fortios.switchcontroller.initialconfig as __initialconfig @@ -58,6 +60,7 @@ import pulumiverse_fortios.switchcontroller.securitypolicy as __securitypolicy securitypolicy = __securitypolicy else: + acl = _utilities.lazy_import('pulumiverse_fortios.switchcontroller.acl') autoconfig = _utilities.lazy_import('pulumiverse_fortios.switchcontroller.autoconfig') initialconfig = _utilities.lazy_import('pulumiverse_fortios.switchcontroller.initialconfig') ptp = _utilities.lazy_import('pulumiverse_fortios.switchcontroller.ptp') diff --git a/sdk/python/pulumiverse_fortios/switchcontrolleracl/__init__.py b/sdk/python/pulumiverse_fortios/switchcontroller/acl/__init__.py similarity index 92% rename from sdk/python/pulumiverse_fortios/switchcontrolleracl/__init__.py rename to sdk/python/pulumiverse_fortios/switchcontroller/acl/__init__.py index df36c8a2..43b9e081 100644 --- a/sdk/python/pulumiverse_fortios/switchcontrolleracl/__init__.py +++ b/sdk/python/pulumiverse_fortios/switchcontroller/acl/__init__.py @@ -2,7 +2,7 @@ # *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. *** # *** Do not edit by hand unless you're certain you know what you are doing! *** -from .. import _utilities +from ... import _utilities import typing # Export this package's modules as members: from .group import * diff --git a/sdk/python/pulumiverse_fortios/switchcontrolleracl/_inputs.py b/sdk/python/pulumiverse_fortios/switchcontroller/acl/_inputs.py similarity index 99% rename from sdk/python/pulumiverse_fortios/switchcontrolleracl/_inputs.py rename to sdk/python/pulumiverse_fortios/switchcontroller/acl/_inputs.py index 027d698e..949f6a88 100644 --- a/sdk/python/pulumiverse_fortios/switchcontrolleracl/_inputs.py +++ b/sdk/python/pulumiverse_fortios/switchcontroller/acl/_inputs.py @@ -7,7 +7,7 @@ import pulumi import pulumi.runtime from typing import Any, Mapping, Optional, Sequence, Union, overload -from .. import _utilities +from ... import _utilities __all__ = [ 'GroupIngressArgs', diff --git a/sdk/python/pulumiverse_fortios/switchcontrolleracl/group.py b/sdk/python/pulumiverse_fortios/switchcontroller/acl/group.py similarity index 97% rename from sdk/python/pulumiverse_fortios/switchcontrolleracl/group.py rename to sdk/python/pulumiverse_fortios/switchcontroller/acl/group.py index 7099d194..ae099c59 100644 --- a/sdk/python/pulumiverse_fortios/switchcontrolleracl/group.py +++ b/sdk/python/pulumiverse_fortios/switchcontroller/acl/group.py @@ -7,7 +7,7 @@ import pulumi import pulumi.runtime from typing import Any, Mapping, Optional, Sequence, Union, overload -from .. import _utilities +from ... import _utilities from . import outputs from ._inputs import * @@ -208,7 +208,7 @@ def __init__(__self__, SwitchControllerAcl Group can be imported using any of these accepted formats: ```sh - $ pulumi import fortios:switchcontrolleracl/group:Group labelname {{name}} + $ pulumi import fortios:switchcontroller/acl/group:Group labelname {{name}} ``` If you do not want to import arguments of block: @@ -216,7 +216,7 @@ def __init__(__self__, $ export "FORTIOS_IMPORT_TABLE"="false" ```sh - $ pulumi import fortios:switchcontrolleracl/group:Group labelname {{name}} + $ pulumi import fortios:switchcontroller/acl/group:Group labelname {{name}} ``` $ unset "FORTIOS_IMPORT_TABLE" @@ -243,7 +243,7 @@ def __init__(__self__, SwitchControllerAcl Group can be imported using any of these accepted formats: ```sh - $ pulumi import fortios:switchcontrolleracl/group:Group labelname {{name}} + $ pulumi import fortios:switchcontroller/acl/group:Group labelname {{name}} ``` If you do not want to import arguments of block: @@ -251,7 +251,7 @@ def __init__(__self__, $ export "FORTIOS_IMPORT_TABLE"="false" ```sh - $ pulumi import fortios:switchcontrolleracl/group:Group labelname {{name}} + $ pulumi import fortios:switchcontroller/acl/group:Group labelname {{name}} ``` $ unset "FORTIOS_IMPORT_TABLE" @@ -291,7 +291,7 @@ def _internal_init(__self__, __props__.__dict__["name"] = name __props__.__dict__["vdomparam"] = vdomparam super(Group, __self__).__init__( - 'fortios:switchcontrolleracl/group:Group', + 'fortios:switchcontroller/acl/group:Group', resource_name, __props__, opts) diff --git a/sdk/python/pulumiverse_fortios/switchcontrolleracl/ingress.py b/sdk/python/pulumiverse_fortios/switchcontroller/acl/ingress.py similarity index 97% rename from sdk/python/pulumiverse_fortios/switchcontrolleracl/ingress.py rename to sdk/python/pulumiverse_fortios/switchcontroller/acl/ingress.py index db73ccd2..89547771 100644 --- a/sdk/python/pulumiverse_fortios/switchcontrolleracl/ingress.py +++ b/sdk/python/pulumiverse_fortios/switchcontroller/acl/ingress.py @@ -7,7 +7,7 @@ import pulumi import pulumi.runtime from typing import Any, Mapping, Optional, Sequence, Union, overload -from .. import _utilities +from ... import _utilities from . import outputs from ._inputs import * @@ -241,7 +241,7 @@ def __init__(__self__, SwitchControllerAcl Ingress can be imported using any of these accepted formats: ```sh - $ pulumi import fortios:switchcontrolleracl/ingress:Ingress labelname {{fosid}} + $ pulumi import fortios:switchcontroller/acl/ingress:Ingress labelname {{fosid}} ``` If you do not want to import arguments of block: @@ -249,7 +249,7 @@ def __init__(__self__, $ export "FORTIOS_IMPORT_TABLE"="false" ```sh - $ pulumi import fortios:switchcontrolleracl/ingress:Ingress labelname {{fosid}} + $ pulumi import fortios:switchcontroller/acl/ingress:Ingress labelname {{fosid}} ``` $ unset "FORTIOS_IMPORT_TABLE" @@ -277,7 +277,7 @@ def __init__(__self__, SwitchControllerAcl Ingress can be imported using any of these accepted formats: ```sh - $ pulumi import fortios:switchcontrolleracl/ingress:Ingress labelname {{fosid}} + $ pulumi import fortios:switchcontroller/acl/ingress:Ingress labelname {{fosid}} ``` If you do not want to import arguments of block: @@ -285,7 +285,7 @@ def __init__(__self__, $ export "FORTIOS_IMPORT_TABLE"="false" ```sh - $ pulumi import fortios:switchcontrolleracl/ingress:Ingress labelname {{fosid}} + $ pulumi import fortios:switchcontroller/acl/ingress:Ingress labelname {{fosid}} ``` $ unset "FORTIOS_IMPORT_TABLE" @@ -327,7 +327,7 @@ def _internal_init(__self__, __props__.__dict__["get_all_tables"] = get_all_tables __props__.__dict__["vdomparam"] = vdomparam super(Ingress, __self__).__init__( - 'fortios:switchcontrolleracl/ingress:Ingress', + 'fortios:switchcontroller/acl/ingress:Ingress', resource_name, __props__, opts) diff --git a/sdk/python/pulumiverse_fortios/switchcontrolleracl/outputs.py b/sdk/python/pulumiverse_fortios/switchcontroller/acl/outputs.py similarity index 99% rename from sdk/python/pulumiverse_fortios/switchcontrolleracl/outputs.py rename to sdk/python/pulumiverse_fortios/switchcontroller/acl/outputs.py index cedb7fd8..0011dbdf 100644 --- a/sdk/python/pulumiverse_fortios/switchcontrolleracl/outputs.py +++ b/sdk/python/pulumiverse_fortios/switchcontroller/acl/outputs.py @@ -7,7 +7,7 @@ import pulumi import pulumi.runtime from typing import Any, Mapping, Optional, Sequence, Union, overload -from .. import _utilities +from ... import _utilities __all__ = [ 'GroupIngress',